diff --git a/src/calibre/gui2/dialogs/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py
index 5d855b5263..b9c57b27ab 100644
--- a/src/calibre/gui2/dialogs/config/__init__.py
+++ b/src/calibre/gui2/dialogs/config/__init__.py
@@ -445,6 +445,7 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         self.username.setText(opts.username)
         self.password.setText(opts.password if opts.password else '')
         self.opt_max_opds_items.setValue(opts.max_opds_items)
+        self.opt_max_opds_ungrouped_items.setValue(opts.max_opds_ungrouped_items)
         self.auto_launch.setChecked(config['autolaunch_server'])
         self.systray_icon.setChecked(config['systray_icon'])
         self.sync_news.setChecked(config['upload_news_to_device'])
@@ -848,6 +849,8 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         sc.set('port', self.port.value())
         sc.set('max_cover', mcs)
         sc.set('max_opds_items', self.opt_max_opds_items.value())
+        sc.set('max_opds_ungrouped_items',
+                self.opt_max_opds_ungrouped_items.value())
         config['delete_news_from_library_on_upload'] = self.delete_news.isChecked()
         config['upload_news_to_device'] = self.sync_news.isChecked()
         config['search_as_you_type'] = self.search_as_you_type.isChecked()
diff --git a/src/calibre/gui2/dialogs/config/config.ui b/src/calibre/gui2/dialogs/config/config.ui
index db748dae7e..917333a989 100644
--- a/src/calibre/gui2/dialogs/config/config.ui
+++ b/src/calibre/gui2/dialogs/config/config.ui
@@ -892,6 +892,26 @@
                  </property>
                 </widget>
                </item>
+               <item row="6" column="1">
+                <widget class="QSpinBox" name="opt_max_opds_ungrouped_items">
+                 <property name="minimum">
+                  <number>25</number>
+                 </property>
+                 <property name="maximum">
+                  <number>1000000</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="0">
+                <widget class="QLabel" name="label_16">
+                 <property name="text">
+                  <string>Max. OPDS &amp;ungrouped items:</string>
+                 </property>
+                 <property name="buddy">
+                  <cstring>opt_max_opds_ungrouped_items</cstring>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </item>
              <item>
diff --git a/src/calibre/library/server/__init__.py b/src/calibre/library/server/__init__.py
index 441aee9b60..5050dfaa99 100644
--- a/src/calibre/library/server/__init__.py
+++ b/src/calibre/library/server/__init__.py
@@ -38,6 +38,12 @@ def server_config(defaults=None):
     c.add_opt('max_opds_items', ['--max-opds-items'], default=30,
             help=_('The maximum number of matches to return per OPDS query. '
             'This affects Stanza, WordPlayer, etc. integration.'))
+    c.add_opt('max_opds_ungrouped_items', ['--max-opds-ungrouped-items'],
+            default=100,
+            help=_('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.'))
     return c
 
 def main():
diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
index f32f60a6dd..d396d73af2 100644
--- a/src/calibre/library/server/opds.py
+++ b/src/calibre/library/server/opds.py
@@ -445,7 +445,7 @@ class OPDSServer(object):
 
         id_ = 'calibre-category-feed:'+which
 
-        MAX_ITEMS = 50
+        MAX_ITEMS = self.opts.max_opds_ungrouped_items
 
         if len(items) <= MAX_ITEMS:
             max_items = self.opts.max_opds_items
@@ -459,8 +459,6 @@ class OPDSServer(object):
                     self.text, self.count = text, count
 
             starts = set([x.name[0] for x in items])
-            if len(starts) > MAX_ITEMS:
-                starts = set([x.name[:2] for x in items])
             category_groups = OrderedDict()
             for x in sorted(starts, cmp=lambda x,y:cmp(x.lower(), y.lower())):
                 category_groups[x] = len([y for y in items if
diff --git a/src/calibre/translations/ar.po b/src/calibre/translations/ar.po
index 26b60f586d..378fa227fa 100644
--- a/src/calibre/translations/ar.po
+++ b/src/calibre/translations/ar.po
@@ -7,166 +7,166 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:23+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:43+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-05-30 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "لا يفعل شيءً"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "قاعدة"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "نوع الملف"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "قارئ دليل المعلومات"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "كاتب دليل المعلومات"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "مولد الكاتالوج"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 "
@@ -175,7 +175,7 @@ msgstr ""
 "إلتحاق بكل الوصلات المحلية في ملف HTML وإنشاء ملف ZIP ليحتوي كل الملفات "
 "الموصولة. هذا الملحق ينفّذ كل مرة تضيف ملف HTML إلى المكتبة."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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."
@@ -183,7 +183,7 @@ msgstr ""
 "رمزالحروف لاجل ملفات HTML المدخلة, تشتمل على الخيارات التالية : cp1252, "
 "latin1, iso-8859-1 وutf-8"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -193,57 +193,57 @@ msgstr ""
 "pmlname_img او صور. هذا المضاف يتم تشغيله كل مرة اضيف فيها ملف PML الى "
 "المكتبة"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "استخرج الغلاف من ملف الرسومات"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "إقرأ دليل المعلومات لكتب في أرشيفات RAR"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "إقرأ ميتاداتا لكتب في أرشيفات ZIP"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "ضبط دليل المعلومات من ملفات %s"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "دخل التحويل"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -254,11 +254,11 @@ msgstr ""
 "متجاوزاً خيارات المستند, هذا الخيار  للمستندان التي لا تعلن عن ترميزها أو "
 "التي ليس لها ترميز خاطىء."
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "خرج التحويل"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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."
@@ -266,11 +266,11 @@ msgstr ""
 "اذا تم اختيارها , سوف يتم جعل المخرجات مقروءة بشرياً قدر الامكان, و قد لا "
 "يكون لا تأثير لبعض المخرجات ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "طور الدخل"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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."
@@ -278,83 +278,83 @@ msgstr ""
 "ملف تعريف هذا يحاول تقديم افتراضات عاقلة ومفيدة إذا كنت لا تعرف شيئا عن "
 "وثيقة الإدخال."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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 ""
 "ملف التعريف هذا هو المقصود لجهاز سوني من خط إنتاج PRS . الـ500/505/600/700 "
 "إلخ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:69
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr "ملف التعريف هذا هو المقصود لجهاز سوني PRS 300."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "ملف التعريف هذا هو المقصود لجهاز سوني PRS 900."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "هذا الطور يستخدم مع Microsoft Reader"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "ملف التعريف هذا يستخدم مع كتب Mobipocket ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "ملف التعريف هذا يستخدم مع Hanlin V3 وأمثاله."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "ملف التعريف هذا يستخدم مع Hanlin V5 وأمثاله."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "ملف التعريف هذا يستخدم مع Cybook G3"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "ملف التعريف هذا يستخدم مع Cybook Opus ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "ملف التعريف هذا يستخدم مع Amazon Kindle ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "ملف التعريف هذا يستخدم مع Irex Illiad ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "ملف التعريف هذا يستخدم مع IRex Digital Reader 1000 ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "ملف التعريف هذا يستخدم مع B&N Nook ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "المخرجات"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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 "
@@ -363,24 +363,24 @@ msgstr ""
 "ملف التعريف هذا يحاول تقديم افتراضات عاقلة و مفيدة إذا كنت ترغب في إصدار "
 "وثيقة للقراءة في جهاز الكمبيوتر أو على مجموعة من الأجهزة."
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "ملف التعريف هذا يستخدم مع سوني PRS-300 ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "ملف التعريف هذا يستخدم مع الخمسة بوصة JetBook ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -388,35 +388,35 @@ msgstr ""
 "ملف التعريف هذا يستخدم مع سوني خط إنتاج PRS . الـ500/505/700 الخ ، في وضع "
 "أفقي.غالباً مفيد للكاريكاتيرات."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "ملف التعريف هذا يستخدم مع Amazon Kindle DX"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "ملحقات مثبتة"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "تعيين لملحقات أنواع الملفات"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "تخصيص الملحقات المحلية"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "ملحقات معطلة"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "لا يجد ملحق صالح "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "فشل استهلال الملحق %s مع اقتفاء الأثر:"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -428,209 +428,250 @@ msgstr ""
 "    المقدرة على التخصيص بتحميل الملحقات الخارجية .\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "إضافة ملحق يتخصيص مسار إلى ملف zip الذي يحتويه."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "حذف الملحق المخصص عن طريق اسمه. لا يؤثر على الملحقات المضمنة"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "تخصيص الملحق . حدد اسم الملحق وسلسلة التخصيص وفرقهما بفاصلة."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "قائمة كل الملحقات المثبتة"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "تمكين الملحق المسمى"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "تعطيل الملحق المسمى"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "التواصل مع هواتف أندرويد ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /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/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى EB600 ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى ESlick ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanlin V3 ."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanlin V5 ."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "التواصل مع القارئ الكتاب الاليكترونى BOOX ."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanvon N520 ."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "اﻹتصال مع الـElonex EB 511 القارئ اﻹلكتروني"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "التواصل مع القارئ الكتاب الاليكترونى IRex Iliad ."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanlin V3 ."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanlin V5 ."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+msgstr "التواصل مع القارئ الكتاب الاليكترونى BOOX ."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr "التواصل مع القارئ الكتاب الاليكترونى Hanvon N520 ."
+
+#: /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 "اﻹتصال مع الـElonex EB 511 القارئ اﻹلكتروني"
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "التواصل مع القارئ الكتاب الاليكترونى IRex Digital Reader 1000 ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "اﻹتصال مع الـ IRex Digital Reader 800"
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Iriver Story ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى JetBook ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Kindle ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Kindle 2 ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Kindle DX ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "الإتصال مع جهاز البالم بري"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "التواصل مع نوكيا 770"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "التواصل مع نوكيا 810"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "جهاز الـNook"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Nook ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى Nuut2 ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "التواصل مع قارئ الكتاب الاليكتروني سوني PRS-500 ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/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:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "التواصل مع قارئات الكتاب الاليكتروني سوني PRS-300/505/500 ."
-
-#: /home/kovid/work/trunk/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: "
@@ -638,216 +679,214 @@ msgstr ""
 "ضع علامة الفاصلة للفصل بين مجموعة من البيانات الوصفية لكي تكون مجموعة في "
 "الجهاز . و تشمل الاحتمالات التالية: "
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "يجري تحويل الكتب إلى الجهاز..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "يجري حذف الكتب من الجهاز..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "يجري إرسال دليل المعلومات. إلى الجهاز..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "التواصل مع قارئات الكتاب الاليكتروني سوني PRS-600/700/900 ."
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr "الإتصال مع جهاز قارئ الكتب الالكترونية Samsung SNE ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "اﻹتصال مع الـ Teclast K3 reader ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "لم يتمكن من كشف القرص %s. حاول إعادة التشغيل."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "غير قادر على الكشف عن %s نقطة التحميل. حاول إعادة التشغيل."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "%s غير قادر على اكتشاف عن الذاكرة"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "غير قادر على جلب المساعد : %s ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr "لا يوجد بطاقات تخزين في القارئ ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "الفتحة المختارة : %s ليست مدعومة ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "لا توجد مساحة كافية في الذاكرة الرئيسية"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "لا توجد مساحة كافية في بطاقة التخزين"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "الأخبار"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "الاتصال مع جهاز قارئ إلكتروني ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "يجري إحصاء معلومات الجهاز..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "إضافة كتب لقائمة للبيانات الوصفية للجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+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/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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 "استخراج الصورة المصغّرة من ملف LRF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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."
@@ -855,24 +894,24 @@ msgstr ""
 "استخراج الغلاف من ملف LRF. لاحظ أن تهيئة LRF لا يستخدم غلاف مخصص، فنستخدم "
 "بعض الشروط لتخمينه."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr "تم تصوير %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "فشل %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
@@ -882,44 +921,44 @@ msgstr ""
 "\n"
 "%s ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "تعطيل التشحيذ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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."
@@ -927,13 +966,13 @@ msgstr ""
 "تستخدم لمنشورات يمين إلى يسار مثل المانغا اليابانية، إلخ. يتسبب بتقسيم صور "
 "عرضية إلى صور طولية من اليمين إلى اليسار."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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."
@@ -941,27 +980,27 @@ msgstr ""
 "لا ترتّب ملفات موجودة في الرسومات أبجدياً، بل استخدم الترتيب المستخدم في "
 "الرسومات."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -987,58 +1026,58 @@ msgid ""
 "For full documentation of the conversion system see\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "خيارات الدخل"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr "خيارات للتحكم في معالجة الملف المدخل %s ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "خيارات الخرج"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "خيارات للتحكم في معالجة الملف المُخرج %s ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "تحكّم بالكشف الآلي لبناء المستند"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "خيارات لوضع البيانات الوصفية في المُخرجات ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "خيارات للمساعدة في تصحيح التحويل ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "قائمة من الوصفات المدمجة"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr "المخرجات حُفِظت في"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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 "
@@ -1047,7 +1086,7 @@ msgstr ""
 "احفظ المخرجات في مراحل مختلفة من عملية التحويل إلى الدليل المقصود . مفيدة "
 "إذا كنت لا تعلم في أي مرحلة من مراحل التحويل تظهر العلة ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1055,7 +1094,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1063,7 +1102,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1071,7 +1110,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1080,17 +1119,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1098,28 +1137,28 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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 "
@@ -1128,11 +1167,11 @@ msgstr ""
 "عادةً، إذا يوجد قائمة محتويات في الملف المصدر، يتم استخدامه بدلاً من القائمة "
 "التي تم إنشاءه آلياً. بهذا الخيار، يتم استخدام القائمة المنشئة آلياً دوماً."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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"
@@ -1140,20 +1179,20 @@ msgstr ""
 "إذا يتم كشف عدد أقل من هذا بين الفصول فسوف يضيف وصلات إلى قائمة المحتويات. "
 "الإفتراضي هو: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1163,7 +1202,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1171,39 +1210,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1212,34 +1251,34 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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."
@@ -1247,41 +1286,41 @@ msgstr ""
 "حذف أول صورة من دخل الكتاب الإلكتروني. هذا يفيد حين تريد استخدام غلاف مختلف "
 "من الغلاف المضمون."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1291,7 +1330,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1301,111 +1340,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "لم يتمكّن من الحصول على كتاب داخل الأرشيف"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1414,21 +1453,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1436,7 +1475,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1445,42 +1484,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1488,66 +1527,66 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr "إنشاء ملف LIT من EPUB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr "\tتم اكتشاف ملف Book Designer."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "يعالج %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr "\tتحويل لـBBeB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr "%s ملف فارغ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr "لا يمكن إضافة وصلات %s لقائمة المحتويات"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1555,12 +1594,12 @@ msgstr ""
 "لم يتمكن من معالجة: %s\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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 "حدث خطأ حين تنفيذ الجدول: %s. سيتم تجاهل توسيم الجدول."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1568,76 +1607,76 @@ msgstr ""
 "جدول غير صالح:\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr "لم يتمكن من قراءة صورة الغلاف: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr "لا يمكن القراءة من: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr "فشل في معالجة ملف opf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr "خرج ملف LRS"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "إنشاء XML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr "تم كتابة LRS في "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr "لم يتمكّن من قراءة ملف الصورة المصغّرة:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr "المسار إلى ملف الخرج"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
 msgstr "تحويل LRS إلى LRS، يفيد في التنقيح."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr "ملف LRF غير صالح. لم يتمكّن ضبط الميتاداتا."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1651,40 +1690,40 @@ msgstr ""
 "إظهار/تحرير الميتاداتا في ملف LRF.\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
 msgstr "ضبط المساحة بين الكلمات بنقاط. الإفتراضي هو %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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)"
@@ -1692,120 +1731,124 @@ msgstr ""
 "تحويل الجداول في الـHTML كصور (هذا يفيد إذا كان للمستند جداول كبيرة أو "
 "معقّدة)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr "ضم أسرة الخطوط بالترويس"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr "ضم أسرة الخطوط بدون الترويس"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr "ضم أسرة الخطوط أحادية القياس"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "العنوان"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "المؤلف أو المؤلفون"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "الناشر"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "المنتج"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "التعليقات"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "الوسوم"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "السلسلة"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "اللغة"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "ختم التوقيت"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1819,120 +1862,120 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr "تم حفظ الغلاف في"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1946,41 +1989,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "المؤلف الذي تريد البحث عنه."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "العنوان الذي تريد البحث عنه."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr "الناشر الذي تريد البحث عنه."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr "LibraryThing.com لم يرد. حاول لاحقاً."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " لم يوجد."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr "خطأ في خادم LibraryThing.com. حاول لاحقاً."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -1988,166 +2031,162 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "الغلاف"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr "الفهرس"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr "المسرد"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr "شكر وتقدير"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "ببليوغرافيا"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "حقوق المؤلف"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr "الإهداء"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr "افتتاحية"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "الملاحظات"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "افتتاحية"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "الكتب بتهيئة %s ليست مدعومة"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2155,32 +2194,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2192,114 +2231,114 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2308,33 +2347,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2349,90 +2388,96 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2440,296 +2485,443 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr "تأكيد قبل الحذف"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr "حجم أيقونات شريط الأدوات"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Notify when a new version is available"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr "ترتيب الوسوم حسب الشهرة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr "الإفتراضي للتحويل إلى LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr "الخيارات لمستعرض كتب LRF"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "يتم البحث في"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "تم الحفظ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2738,135 +2930,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2874,105 +3066,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -2988,292 +3140,292 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr "حجم الخط& الأساسي:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr "حذف الفراغات& بين الفقرات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr "استخدم غلاف من المصدر&"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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."
@@ -3281,441 +3433,445 @@ msgstr ""
 "الوسوم تصنّف الكتاب. هذا يفيد كثيراً في البحث. <br><br>ممكن تكون أي كلمة أو "
 "مجموعة كلمات، مفرقة بفاصلة."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "ضبط الصفحة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr "طور ال&خرج:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "وصف الطور"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr "طور ال&دخل"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr "ع&لامة الفصل:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3725,354 +3881,415 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr "احصل على معلومات الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr "احصل على قائمة الكتب على الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr "ارسل الميتاداتا إلى الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr "رفع %d كتاب إلى الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr "حذف كتب من الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr "تنزيل الكتب من الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr "عرض كتاب على الجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "المسار"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "التهيئات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr "ال&سابق"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr "ال&تالي"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "إختيار التهيئة"
 
-#: /home/kovid/work/trunk/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 "ضبط الإفتراضي في تحويل الرسومات (ملفات CBZ/CBR)"
 
-#: /home/kovid/work/trunk/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 "ضبط الخيارات لتحويل %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr ":ال&عنوان"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr "ال&مؤلف:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr "&طور:"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
@@ -4080,164 +4297,191 @@ msgstr ""
 "محتوى\n"
 "خادم"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "خطأ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "مسار الملحق غير صالح"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s ليس مسار لملحق صالح"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "إختيار الملحق"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "لا يمكن تعطيل الملحق"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "الملحق: %s لا يمكن تعطيله"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "لا يمكن تخصيص الملحق"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "الملحق: %s لا يحتاج التخصيص"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "لم يمكن حذف الملحق المضمن"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " لا يمكن حذفه. هذا ملحق مضمن في البرنامج. حاول تعطيله بدلاً من حذفه."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "سجل الأخطاء:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "سجل النفاذ:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "فشل في تشغيل خادم المحتوى"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "حجم غير صالح"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>يجب أن يكون دليل."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4245,32 +4489,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4281,327 +4525,343 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " ثانية"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr "إختر ال&لغة (يحتاج إعادة تشغيل):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "عادي"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr "مرتفع"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr "منخفض"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "إرسال الأخبار& التي تم تنزيلها آلياً إلى قارئ الكتب الإلكترونية"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "شريط الأدوات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr "كبير"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr "متوسط"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr "صغير"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr "&حجم الأزرار على شريط الأدوات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr "إظهار النص& على أزرار شريط الأدوات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "استخدم المستعرض& الداخلي في:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4611,121 +4871,234 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr "ت&خصيص الملحق"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr "&حذف الملحق"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr "إضافة ملحق جديد"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr "&ملف الملحق:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr "&إضافة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "تاريخ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4734,68 +5107,64 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "هل أنت متأكّد؟"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "خطأ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "ترتيب المؤلف"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr "لم يوجد ميتاداتا"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4803,128 +5172,123 @@ msgid ""
 "below."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "تحرير معلومات الميتا"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "معلومات الميتا"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr "ضبط& ترتيب المؤلف آلياً"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr "حذف& الوسوم:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr "حذف الت&هيئة:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -4932,460 +5296,586 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "كتب"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr "ج&دولة للتنزيل:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "اليوم"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "الأثنين"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "الأربعاء"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "الخميس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "الجمعة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "السبت"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "الأحد"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr "في"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr "&حساب"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr "&تنزيل الآن"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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 ""
 "حذف الأخبار المنزّلة التي أقدم من العدد المخصص من الأيام. اضبطه بـ0 لتعطيله."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr "حذف أخبار أقدم من "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "يحتوي على"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr "بحث متقدم"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "محرر الوسوم"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "الوسوم المت&وفرة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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."
@@ -5393,23 +5883,23 @@ msgstr ""
 "حذف الوسم من قائمة البيانات. هذا سيحذف الوسم من الكتب وثم سيحذف الوسم تماماً "
 "من القاعدة."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr "علّم الكتاب الحالي بالوسم"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr "الوسوم الم&علّمة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr "حذف الوسم من الكتاب الحالي"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr "إض&افة وسم:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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."
@@ -5417,135 +5907,195 @@ msgstr ""
 "إذا الوسم الذي تريده ليس متوفر، بإمكانك إضافته هنا. يقبل قائمة من الوسوم "
 "مفرّقة بفاصلات."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5559,62 +6109,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5638,846 +6188,1005 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr "اسم ال&ملف:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr ":العنوان"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr "المؤلفون:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr "السلسلة:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr "فهرس السلسلة:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regular expression (?P<series_index>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "الحالة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr "غير متوفر"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "بدون"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "كتاب <font face=\"serif\">%s</font> لـ%s."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr "التهيئة"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "التهيئة"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr " - مستعرض LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr "مستعرض LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr "كاليبر"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "بحث متقدّم"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "&بحث:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "ترتيب حسب الش&هرة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "إضافة كتب"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "حذف كتب"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "تحرير معلومات الميتا"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "إرسال لجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "حفظ إلى القرص"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "احصل على الأخبار"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "تحويل الكتاب الإلكتروني"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "عرض"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "كتب بنفس الوسوم"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "بحث"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /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/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/sidebar.py:84
+msgid "Hide Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "المؤلفون"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "الناشرون"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr "احصل على الأخبار من "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "تبرع& لدعم كاليبر"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "إعادة تشغيل&"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr "تحرير الميتاداتا فردياً"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr "تحرير الميتاداتا جملةً"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr "إضافة كتب من دليل واحد"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr "حفظ إلى القرص في دليل واحد"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr "عرض تهيئة معينة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "الجهاز: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " تم كشفه."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "متصل "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6493,204 +7202,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "كتب EPUB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "كتب LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "كتب HTML"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "كتب LIT"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "كتب MOBI"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "كتب نصّية"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "كتب PDF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "الرسومات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "أرشيفات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 "الكتب المختارة <b>سوف تحذف تماماً</b> من حاسوبك. هل أنت متأكّد؟"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 "لا يمكن تحرير الميتاداتا"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6698,7 +7413,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6708,93 +7423,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "إختيار دليل الوجهة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "لا يمكن تحويله"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6802,735 +7513,745 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "خطأ في الاتصال بالجهاز"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "تحديث متوفر"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr "&خيارات الخط"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr "أسرة خطوط أحادية القياس&:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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 " px"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr "حجم الخط& الأحادي القياس:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr "بترويس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr "بدون ترويس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr "أحادي القياس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr "خيارات الخط"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr "أسرة الخطوط بالترويس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr "أسرة الخطوط بدون الترويس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr "أسرة الخطوط أحادية القياس"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr "قياس الخط المعياري بـpx"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr "قياس خط الأحادي القياس بـpx"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr "إختيار الكتاب الإلكتروني"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr "كتب إلكترونية"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr "يتم تحميل الكتاب الإلكتروني..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr "لم يتمكن من فتح الكتاب الإلكتروني"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr "شريط الأدوات"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr "الصفحة التالية"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr "الصفحة السابقة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr "تكبير حجم الخط"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr "تصغير حجم الخط"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr "قاعدة البيانات غير صالحة"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7539,150 +8260,150 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7690,45 +8411,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7737,7 +8469,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7745,14 +8477,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7761,14 +8493,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7777,28 +8509,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7807,7 +8539,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7817,27 +8549,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7846,7 +8578,7 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -7856,54 +8588,48 @@ msgstr ""
 "الحقول المتوفرة: %s\n"
 "الإفتراضي: %%default"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7912,43 +8638,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7957,11 +8683,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7970,15 +8696,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7988,11 +8714,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8002,15 +8728,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -8023,11 +8749,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8038,27 +8764,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8069,23 +8795,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8096,30 +8822,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8131,17 +8857,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8150,19 +8876,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8172,15 +8898,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8192,111 +8918,127 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8304,7 +9046,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8312,7 +9054,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8320,422 +9062,500 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr "أنشأه "
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr "انتهى"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr "الإنغليزي"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr "تلقيم مجهول"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "مقالة بدون عنوان"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "تم التنزيل"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "فشل تنزيل المقالات التالية:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr "فشل تنزيل أجزاء من المقالات التالية:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " من "
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "محاولة تنزيل الغلاف..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "تم تنزيل التلقيم إلى %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "لم يتمكّن من تنزيل الغلاف: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "يتم تنزيل الغلاف من %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "مقالة بدون عنوان"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "المقالة منزّلة: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "فشل تنزيل المقالة: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr "أنت"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8744,7 +9564,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -9324,3 +10144,9 @@ msgstr ""
 
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "هذا الطور يستخدم مع أجهزة SONY PRS، من أنواع 500/505/700 إلخ."
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "التواصل مع قارئات الكتاب الاليكتروني سوني PRS-600/700/900 ."
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "التواصل مع قارئات الكتاب الاليكتروني سوني PRS-300/505/500 ."
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 22a9a9b8ef..6161476967 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-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-06-02 20:52+0000\n"
-"Last-Translator: S. Dorscht <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-05 15:43+0000\n"
+"Last-Translator: Gerold Kogler <gnosis@gmx.at>\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-03 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -71,9 +71,9 @@ msgstr "Macht absolut gar nichts"
 #: /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
@@ -101,8 +101,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -122,18 +122,18 @@ msgstr "Macht absolut gar nichts"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -159,11 +159,11 @@ msgstr "Dateityp"
 msgid "Metadata reader"
 msgstr "Metadaten lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Metadaten schreiben"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Katalogerstellung"
 
@@ -282,7 +282,7 @@ msgstr ""
 "hilfreich, wenn Sie nichts über das Eingabe-Dokument wissen."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 ""
@@ -294,62 +294,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Dieses Profil ist geeignet für den B&N Nook."
 
@@ -367,25 +367,25 @@ msgstr ""
 "hilfreich, wenn Sie ein Dokument zum Lesen an einem Computer oder auf einer "
 "Reihe von verschiedenen Geräten erstellen wollen."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr ""
 "Geeignet für das iPad und ähnliche Geräte mit einer Auflösung von 768 x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 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:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 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:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -393,7 +393,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:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Dieses Profil ist geeignet für den Amazon Kindle DX."
 
@@ -481,33 +481,33 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommunikation mit S60-Telefonen."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 msgid "Communicate with iBooks through iTunes."
 msgstr "Kommunikation mit iBooks über iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 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:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
 msgstr "Aktualisiere die Liste der Geräte-Metadaten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d von %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "abgeschlossen"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -517,17 +517,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:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /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:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -772,7 +772,7 @@ msgstr "Nicht genügend freier Speicherplatz auf der Speicherkarte"
 #: /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:1178
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Nachrichten"
@@ -2042,7 +2042,7 @@ msgid "Comments"
 msgstr "Bemerkung"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2052,7 +2052,7 @@ msgid "Tags"
 msgstr "Etiketten (Tags)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2326,7 +2326,7 @@ msgstr ""
 "abrufen\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Umschlagbild"
 
@@ -2367,70 +2367,70 @@ msgstr "Alle Artikel"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Dies ist ein Amazon Topaz-Buch. Es kann nicht verarbeitet werden."
 
-#: /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 "Titelseite"
 
-#: /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 "Inhaltsverzeichnis"
 
-#: /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 "Index"
 
-#: /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 "Glossar"
 
-#: /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 "Danksagung"
 
-#: /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 "Literaturverzeichnis"
 
-#: /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 "Schlussschrift"
 
-#: /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 "Copyright"
 
-#: /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 "Widmung"
 
-#: /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 "Epigraph"
 
-#: /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 "Vorwort"
 
-#: /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 "Abbildungsverzeichnis"
 
-#: /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 "Tabellenverzeichnis"
 
-#: /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 "Anmerkungen"
 
-#: /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 "Vorwort"
 
-#: /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 "Haupttext"
 
@@ -3006,20 +3006,24 @@ msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Maximale Anzahl gleichzeitiger Aufträge auf die Anzahl der CPUs beschränken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /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:138
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopiert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Dateien wählen"
 
@@ -3027,41 +3031,41 @@ msgstr "Dateien wählen"
 msgid "Searching in"
 msgstr "Suche in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Füge hinzu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr "Suche in allen Unterverzeichnissen..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Verzeichnis Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Keine Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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 "Keine Bücher gefunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Hinzugefügt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Hinzufügen schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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."
@@ -3070,11 +3074,11 @@ msgstr ""
 "Versuchen Sie Calibre neu zu starten und fügen Sie die Bücher in kleineren "
 "Mengen hinzu, bis Sie das verantwortliche Buch finden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Duplikate gefunden!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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?"
@@ -3082,15 +3086,15 @@ msgstr ""
 "Es gibt schon Bücher mit dem selben Titel wie die folgenden in der "
 "Datenbank. Trotzdem hinzufügen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Füge Duplikate hinzu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Gespeichert"
 
@@ -3180,15 +3184,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -3197,6 +3201,8 @@ msgstr ""
 #: /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
@@ -3205,6 +3211,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/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
@@ -3316,8 +3324,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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -4042,22 +4050,22 @@ msgstr "Seitenverhältnis des Umschl&agbildes beibehalten"
 msgid "RB Output"
 msgstr "RB-Ausgabe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
+#: /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 "Format zur Vorschau wählen"
 
-#: /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 ""
 "Erstellung eines regulären Ausdrucks mit der GUI Erstellung ohne Buch nicht "
 "möglich."
 
-#: /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 "Keine Formate verfügbar"
 
-#: /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 "Buch öffnen"
 
@@ -4822,152 +4830,152 @@ msgstr ""
 msgid "new email address"
 msgstr "Neue eMail-Adresse"
 
-#: /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 "System port selected"
 msgstr "System-Port ausgewählt"
 
-#: /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 ""
 "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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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 "Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 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:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Kommandozeilen-Tools installiert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr "Kommandozeilen-Tools installiert in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "Kein gültiger Plugin-Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Plugin wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Plugin kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 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:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Plugin nicht anpassbar"
 
-#: /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: %s does not need customization"
 msgstr "Plugin: %s bedarf keines Anpassens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Kann festinstalliertes Plugin nicht entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 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:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 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:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr "Fehler Log:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 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:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungültig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Muss ein Verzeichnis sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 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:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
 msgstr "Neustart erforderlich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4975,19 +4983,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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 msgid "Checking database integrity"
 msgstr "Überprüfe Vollständigkeit der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 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:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "Einige Inkonsistenzen gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -5123,13 +5131,13 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "An das Gerät sen&den"
 
-#: /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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5138,29 +5146,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:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 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:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 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:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 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:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 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:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5168,136 +5176,140 @@ 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:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /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:537
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /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:538
 msgid "Normal"
 msgstr "Normal"
 
-#: /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:539
 msgid "High"
 msgstr "Hoch"
 
-#: /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:540
 msgid "Low"
 msgstr "Niedrig"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr "Auftrags&priorität:"
 
-#: /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:542
 msgid "Preferred &output format:"
 msgstr "Bev&orzugtes Ausgabe-Format:"
 
-#: /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:543
 msgid "Preferred &input format order:"
 msgstr "Bevorzugte Reihenfolge des E&ingabe-Formats:"
 
-#: /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:546
 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:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 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:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 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:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 "Zeige Cover-Ansicht in einem eigenen Fenster (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:551
 msgid "Search as you type"
 msgstr "Suchen während der Eingabe"
 
-#: /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 "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:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 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:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 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:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /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 "Large"
 msgstr "Groß"
 
-#: /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 "Medium"
 msgstr "Mittel"
 
-#: /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 "Small"
 msgstr "Klein"
 
-#: /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 "&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:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 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:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 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:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Remove a user-defined column"
 msgstr "Benutzerdefinierte Spalte entfernen"
 
-#: /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:565
 msgid "Add a user-defined column"
 msgstr "Benutzerdefinierte Spalte hinzufügen"
 
-#: /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 "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:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Internen &Viewer verwenden für:"
 
-#: /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 "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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "eM&ail hinzufügen"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Als Voreinstellung verwenden"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "eMail entfe&rnen"
 
-#: /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:575
 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-"
@@ -5307,35 +5319,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:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 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:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr "Vollständigkeit der &Datenbank überprüfen"
 
-#: /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:578
 msgid "&Install command line tools"
 msgstr "Kommandozeilen-Tools &installieren"
 
-#: /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:579
 msgid "Open calibre &configuration directory"
 msgstr "&Calibre Einstellungsverzeichnis öffnen"
 
-#: /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:580
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr "Fehlersuche bei &der Geräteerkennung"
 
-#: /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:582
 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 "
@@ -5345,25 +5357,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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5371,7 +5383,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:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5379,41 +5391,41 @@ 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:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "Maximale Ums&chlagbild-Größe:"
 
-#: /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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /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:594
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /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:595
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /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:596
 #: /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 "
@@ -5431,7 +5443,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:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5439,27 +5451,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:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Plugin &ein-/ausschalten"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "Plugin &anpassen"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "Plugin entfe&rnen"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Neues Plugin hinzufügen"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "&Plugin-Datei:"
 
-#: /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:605
 msgid "&Add"
 msgstr "&Hinzufügen"
 
@@ -5517,7 +5529,7 @@ msgstr "Erstelle und bearbeite Etiketten-basierte Spalten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
 msgid "Text, column shown in the tag browser"
-msgstr ""
+msgstr "Text, Spalte im Etiketten-Browser angezeigt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
 msgid "Comma separated text, like tags, shown in the tag browser"
@@ -5922,7 +5934,7 @@ 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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr "Bücher"
 
@@ -6118,6 +6130,39 @@ msgstr "Passwort erforderlich"
 msgid "Aborting..."
 msgstr "Abbruch läuft ..."
 
+#: /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 "Benötige Benutzernamen und Passwort"
@@ -6371,29 +6416,28 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Formate auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Autoren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr "Herausgeber"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /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:161
+#: /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
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
-msgstr "Etiketten Editor"
+msgid "User Categories Editor"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
@@ -6440,6 +6484,7 @@ 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 "Sind Sie sicher?"
 
@@ -6451,6 +6496,10 @@ msgstr ""
 "Die folgenden Etiketten werden von einem oder mehreren Büchern verwendet. "
 "Sind Sie wirklich sicher, dass Sie sie löschen möchten?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr "Etiketten Editor"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "&Verfügbare Etiketten"
@@ -6493,6 +6542,66 @@ msgstr ""
 "Etikett zu den verfügbaren Etiketten hinzufügen und dem aktuellen Buch "
 "zuweisen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "eMail Einstellungen testen"
@@ -6898,7 +7007,7 @@ msgstr "Buch <font face=\"serif\">%s</font> von %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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
@@ -6928,51 +7037,51 @@ msgstr "Zum Löschen ausgewählt"
 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:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
 msgstr "Spalte %s ausblenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
 msgid "Ascending"
 msgstr "aufsteigend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
 msgstr "absteigend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Left"
 msgstr "Links"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Right"
 msgstr "Rechts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
 msgstr "Zentriert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
 msgstr "Spalte anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Das ist nicht gestattet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7054,67 +7163,71 @@ msgstr "eBook öffnen"
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: /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 "Die im angegebenen Pfad sich befindende Bibliothek verwenden"
 
-#: /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 "Minimiert im Systembereich der Kontrollleiste starten."
 
-#: /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 "Information zur Fehlersuche auf die Konsole ausgeben"
 
-#: /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 "Nicht nach Updates suchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr "Das Erstellen der Bibliothek schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:75
+#: /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:145
+#: /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 "Reparatur schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
 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:150
+#: /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:163
+#: /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:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr "Beschädigte Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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 "
@@ -7124,50 +7237,54 @@ 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:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 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:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 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:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "Start nicht möglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s ist schon gestartet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr "oberen rechten Bereich des Bildschirms."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr "unteren rechten Bereich des Bildschirms."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "Versuchen Sie Ihren Rechner neu zu starten."
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "Versuche Sie die Datei zu löschen"
 
@@ -7289,7 +7406,7 @@ msgid "Send to device"
 msgstr "An Reader übertragen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Auf Festplatte speichern"
 
@@ -7314,7 +7431,7 @@ msgid "C"
 msgstr "C"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Vorschau"
 
@@ -7492,11 +7609,44 @@ msgstr ""
 msgid "Cover browser could not be loaded: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:235
+#: /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
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Suchergebnisse"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -7540,84 +7690,84 @@ 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:68
+#: /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:155
+#: /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:161
+#: /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:184
+#: /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:201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "Spen&den Sie, um Calibre zu unterstützen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "Verbundenes Gerät ausw&erfen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Neustart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:274
+#: /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:276
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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)"
@@ -7626,7 +7776,7 @@ msgstr ""
 "Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
 "verschiedenen Formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:298
+#: /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)"
@@ -7634,105 +7784,105 @@ 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:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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 "Nur das %s Format auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
+#: /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:368
+#: /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:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /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:414
+#: /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:417
+#: /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:433
+#: /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:473
+#: /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:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre Quick-Start-Guide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Umschlagbilder durchsuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
 msgid "({0} of {1})"
 msgstr "({0} von {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "(Alle Bücher)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "({0} of all)"
 msgstr "({0} von allen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Gerät: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Angeschlossen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "Gerätedatenbank ist beschädigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7763,150 +7913,150 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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 "Nur Bibliothek verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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 "Nur aus der Hauptbibliothek erstellte Benutzeranmerkungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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 "Keine Bücher ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 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:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr "Füge Benutzeranmerkungen zur Datenbank hinzu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1126
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 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:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 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:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 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:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 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:1165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 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:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "Wie viele leere Bücher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 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:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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 "Lade Bücher auf das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "EPUB Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "LRF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "HTML Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "LIT Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "MOBI Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr "Topaz Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Text Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "PDF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Archive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "Unterstützte Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "Einige Bücher zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 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:1404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Lesen der Metadaten schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 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:1425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "Löschen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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 "Kein Buch ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "Zu löschende Formate auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 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:1494
+#: /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?"
@@ -7914,63 +8064,63 @@ 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:1511
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Lösche Bücher vom Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Konnte Metadaten nicht laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "soziale Metadaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "Umschlagbilder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "Metadaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Lade %s für %d Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1599
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Das Laden der Metadaten schlug teilweise fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1600
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 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:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Laden der Metadaten schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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 "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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 "Konnte Bücher nicht zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 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:1681
+#: /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 "
@@ -7982,7 +8132,7 @@ msgstr ""
 "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:1692
+#: /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 "
@@ -7998,7 +8148,7 @@ msgstr ""
 "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:1704
+#: /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?"
@@ -8006,84 +8156,84 @@ 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:1803
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Zielverzeichnis auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Fehler während des Speicherns"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 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:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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 "Konnte einige Bücher nicht speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 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:1870
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 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:1887
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "Erstelle %s Katalog..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 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:1903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "Katalog erstellt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "Katalog-Verzeichnis exportieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 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:1921
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " abgerufen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr "Starte Konvertierung von %d Büchern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "Ansehen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2145
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Mehrere Bücher ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
+#: /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 "
@@ -8095,45 +8245,45 @@ msgstr ""
 "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:2155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
 msgid "Cannot open folder"
 msgstr "Konnte Verzeichnis nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s hat keine verfügbaren Formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Es sind keine genaueren Informationen verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2343
+#: /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."
@@ -8141,12 +8291,12 @@ 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:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -8155,15 +8305,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:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Downloadschema ausgeschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Misslungen</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -8172,12 +8322,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:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8188,11 +8338,11 @@ msgstr ""
 "verursachen.<br>\n"
 "                      Sind Sie sicher, dass sie beenden möchten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive Aufträge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8200,7 +8350,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:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8208,11 +8358,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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Neue Version verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -9667,7 +9817,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:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Detaillierte Ausgabeinformation anzeigen. Hilfreich zur Fehlersuche."
 
@@ -9794,27 +9944,27 @@ msgstr "Karte A"
 msgid "Card B"
 msgstr "Karte B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 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:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Überprüfe SQL Vollständigkeit..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Überprüfe fehlende Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "Überprüfte ID"
 
@@ -10037,10 +10187,13 @@ 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:124
 msgid "%d books"
 msgstr "%d Bücher"
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
 msgstr "BEWERTUNG: %s<br />"
@@ -10310,89 +10463,89 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Nachrichtenquelle unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 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:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene Verknüpfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "Feeds der Index-Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Umschlagbild versuchen heruterzuladen ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Erstelle Impressum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Download von [%d Thread(s)] starten ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Umschlagbild konnte nicht heruntergeladen werden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Umschlagbild von %s herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "Impressumskopie geladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Artikel heruntergeladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Herunterladen der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Feed abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10400,7 +10553,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:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -10424,7 +10577,7 @@ msgstr "Geplant"
 msgid "Custom"
 msgstr "Angepasst"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10434,13 +10587,13 @@ msgstr ""
 "\n"
 "URL ist z.B. http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 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:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10448,7 +10601,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:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10456,7 +10609,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:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10464,7 +10617,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:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10472,7 +10625,7 @@ msgstr ""
 "Kleinstes Intervall in Sekunden zwischen aufeinander folgenden Abrufen. "
 "Voreinstellung ist %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10480,7 +10633,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:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -10491,7 +10644,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:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -10505,7 +10658,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:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "CSS-Stylesheets nicht herunterladen."
 
diff --git a/src/calibre/translations/el.po b/src/calibre/translations/el.po
index d85c4bdd2d..eee3547464 100644
--- a/src/calibre/translations/el.po
+++ b/src/calibre/translations/el.po
@@ -7,166 +7,166 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-30 13:36+0000\n"
-"Last-Translator: MasterCom7 <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:59+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Greek <el@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-31 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "Δεν κάνει τίποτα"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "Βάση"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "Τύπος αρχείου"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "Αναγνώστης metadata"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Εγγραφέας metadata"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Δημιουργία καταλόγου"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 "
@@ -176,7 +176,7 @@ msgstr ""
 "ένα αρχείο ZIP που περιέχει όλα τα συνδεδεμένα αρχεία. Το plugin τρέχει κάθε "
 "φορά που προσθέτετε ένα αρχείο HTML στην βιβλιοθήκη."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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."
@@ -184,7 +184,7 @@ msgstr ""
 "Κωδικοποίηση χαρακτήρων για τα εισαγόμενα αρχεία HTML. Συνήθεις επιλογές "
 "συμπεριλαμβάνουν : cp1252, latin1, iso-8859-1 και utf-8"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -193,57 +193,57 @@ msgstr ""
 "Δημιουργία μιας αρχειοθήκης PMLZ που περιέχει το αρχείο PML και όλες τις "
 "εικόνες στον κατάλογο pmlname_img ή images"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "Εξαγωγή εξωφύλλου από αρχεία κόμικς"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Ανάγνωση συνδεδομένων από ηλεκτρονικά βιβλία μέσα σε αρχειοθήκες RAR"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Ανάγνωση συνδεδομένων από ηλεκτρονικά βιβλία μέσα σε αρχειοθήκες ZIP"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "Καθορισμός συνδεδομένων από αρχεία %s"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "Εισαγωγή (δεδομένων) προς μετατροπή"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -256,11 +256,11 @@ msgstr ""
 "για έγγραφα που δεν δηλώνουν κωδικοποίηση ή διαθέτουν εσφαλμένη δήλωση "
 "κωδικοποίησης."
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "Εξαγωγή (δεδομένων) από μετατροπή"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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."
@@ -269,11 +269,11 @@ msgstr ""
 "εξαγόμενα όσο το δυνατόν ανθρωπίνως αναγνώσιμα. Για ορισμένα πρόσθετα εξόδου "
 "μπορεί να μην έχει κανένα αποτέλεσμα."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "Περίγραμμα εισόδου"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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."
@@ -281,84 +281,84 @@ msgstr ""
 "Αυτό το περίγραμμα προσπαθεί να παρέχει λογικά προτερόθετα (αρχικές τιμές) "
 "και είναι χρήσιμο αν δε γνωρίζετε τίποτα για το εισαγόμενο έγγραφο."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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/trunk/src/calibre/customize/profiles.py:69
+#: /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/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Αυτό το περίγραμμα προορίζεται για το SONY PRS-900."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Αυτό το περίγραμμα προορίζεται για το Microsoft Reader."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Αυτό το περίγραμμα προορίζεται για τα βιβλία Mobipocket."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr ""
 "Αυτό το περίγραμμα προορίζεται για το Hanlin V3 και τους κλώνους του."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 "Αυτό το περίγραμμα προορίζεται για το Hanlin V5 και τους κλώνους του."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "Αυτό το περίγραμμα προορίζεται για το Cybook G3."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Αυτό το περίγραμμα προορίζεται για το Cybook Opus."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Αυτό το περίγραμμα προορίζεται για το Amazon Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Αυτό το περίγραμμα προορίζεται για το Irex Illiad."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Αυτό το περίγραμμα προορίζεται για το IRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Αυτό το περίγραμμα προορίζεται για το IRex Digital Reader 800."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Αυτό το περίγραμμα προορίζεται για το B&N Nook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "Περίγραμμα εξαγομένων"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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 "
@@ -368,24 +368,24 @@ msgstr ""
 "και είναι χρήσιμο για την παραγωγή εγγράφων που προορίζονται να διαβαστούν "
 "σε Η/Υ ή σε μια ποικιλία συσκευών."
 
-#: /home/kovid/work/trunk/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 "Προορίζεται για το iPad και παρόμοιες συσκευές με ανάλυση 768x1024"
 
-#: /home/kovid/work/trunk/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 "Αυτό το περίγραμμα προορίζεται για το Kobo Reader."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Αυτό το περίγραμμα προορίζεται για το SONY PRS-300."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Αυτό το περίγραμμα προορίζεται για το JetBook 5 ιντσών."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -393,35 +393,35 @@ msgstr ""
 "Αυτό το περίγραμμα προορίζεται για τη σειρά SONY PRS. Τα 500/505/700 κλπ., "
 "σε οριζόντια διάταξη (landscape). Χρήσιμο κυρίως για κόμικς."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Αυτό το περίγραμμα προορίζεται για το Amazon Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "Εγκατεστημένα πρόσθετα"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "Απεικόνιση για πρόσθετα αρχειοτύπων"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "Τοπική εξατομίκευση προσθέτων"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "Απενεργοποιημένα πρόσθετα"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "Δεν βρέθηκε έγκυρο πρόσθετο "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Η αρχικοποίηση του πρόσθετου %s απέτυχε με traceback:"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -433,19 +433,19 @@ msgstr ""
 "    Εξατομίκευση του calibre με φόρτωση εξωτερικών προσθέτων.\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Προσθήκη ενός προσθέτου με προσδιορισμό της διεύθυνσης (path) του αρχείου "
 "zip που το περιέχει."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Αφαίρεση εξατομικευμένων προσθέτων, ονομαστικά. Δεν επηρεάζει τα "
 "ενσωματωμένα πρόσθετα"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -453,23 +453,23 @@ msgstr ""
 "Εξατομίκευση προσθέτου. Προσδιόρισε όνομα προσθέτου και στοιχειοσειρά "
 "εξατομίκευσης χωρισμένα με κόμμα."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "Εμφάνιση όλων των εγκατεστημένων πρόσθετων"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "Ενεργοποίηση του ονομαζόμενου προσθέτου"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "Απενεργοποίηση του ονομαζόμενου προσθέτου"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "Επικοινωνία με τηλέφωνα Android."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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"
@@ -477,173 +477,215 @@ msgstr ""
 "Σειρά καταλόγων στη συσκευή, χωρισμένων με κόμμα, προς αποστολή ηλεκτρονικών "
 "βιβλίων. Ο πρώτος στη σειρά θα χρησιμοποιηθεί."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr "Επικοινωνία με τηλέφωνα S60."
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
+msgid "Ordered list of formats the device will accept"
+msgstr ""
+"Ταξινομημένος κατάλογος των μορφοτύπων (format) που δέχεται η συσκευή"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Binatone Readme."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "Επικοινωνία με το «έξυπνο» τηλέφωνο Blackberry."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Cybook Gen 3 / Opus."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο EB600."
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr "Επικοινωνία με το Entourage Edge."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο ESlick."
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Επικοινωνία με τα ηλ.αναγνωστήρια Hanlin V3."
+#: /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/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Επικοινωνία με τα ηλ.αναγνωστήρια Hanlin V5."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο BOOX."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Hanvon N520."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο SpringDesign Alex."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr "Επικοινωνία με το Azbooka"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Elonex EB 511."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο IRex Iliad."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "Επικοινωνία με τα ηλ.αναγνωστήρια Hanlin V3."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "Επικοινωνία με τα ηλ.αναγνωστήρια Hanlin V5."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+msgstr "Επικοινωνία με το ηλ.αναγνωστήριο BOOX."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Hanvon N520."
+
+#: /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:67
+msgid "Communicate with the Azbooka"
+msgstr "Επικοινωνία με το Azbooka"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Elonex EB 511."
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "Επικοινωνία με το ηλ.αναγνωστήριο IRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "Επικοινωνία με το IRex Digital Reader 800"
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "Επικοινωνία με το Iriver Story reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο JetBook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Kindle 2."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr "Επικοινωνία με το Kobo Reader"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "Επικοινωνία με το Palm Pre"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr "Επικοινωνία με το Booq Avant"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Επικοινωνία με το Nokia 770 internet tablet."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "Επικοινωνία με το Nokia 810 internet tablet."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "Το Nook"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Nook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Nuut2."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Sony PRS-500."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/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:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Sony PRS-300/505/500."
-
-#: /home/kovid/work/trunk/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: "
@@ -651,63 +693,45 @@ msgstr ""
 "Κατάλογος πεδίων συνδεδομένων, χωρισμένων με κόμμα, στη συσκευή, προς "
 "μετατροπή σε συλλογές. Οι πιθανότητες συμπεριλαμβάνουν: "
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "Μεταφορά βιβλίων στη συσκευή..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Αφαίρεση βιβλίων από τη συσκευή..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Αποστολή συνδεδομένων στη συσκευή..."
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Samsung SNE."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "Επικοινωνία με το Teclast K3 reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr "Επικοινωνία με το Newsmy reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr "Επικοινωνία με το iPapyrus reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Αδύνατον να εντοπιστεί ο σκληρός δίσκος %s. Δοκιμάστε επανεκκίνηση."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Αδύνατον να εντοπιστεί το σημείο εφαρμογής %s. Δοκιμάστε επανεκκίνηση."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "Αδύνατον να εντοπιστεί ο σκληρός δίσκος %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "Δεν βρέθηκε ο βοηθός εφαρμογής: %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -715,157 +739,172 @@ msgstr ""
 "Αδύνατον να εντοπιστεί ο σκληρός δίσκος %s. Είναι πιθανό ο πυρήνας σας "
 "(kernel) να εξαγάγει μια παρωχημένη έκδοση του SYSFS."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Αδύνατον να εφαρμοστεί η κύρια μνήμη (Κώδικας σφάλματος : %d)"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr "Δεν υπάρχει κάρτα αποθήκευσης στην υποδοχή του ηλ.αναγνωστηρίου."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "Η επιλεγμένη υποδοχή: %s δεν υποστηρίζεται."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "Δεν υπάρχει αρκετός χώρος στην κύρια μνήμη."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "Δεν υπάρχει αρκετός χώρος στην κάρτα αποθήκευσης"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "Νέα"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Ρύθμιση συσκευής"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "Ρυθμίσεις για οδηγούς συσκευών"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr ""
-"Ταξινομημένος κατάλογος των μορφοτύπων (format) που δέχεται η συσκευή"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "Ανάγνωση συνδεδομένων από τα αρχεία της συσκευής"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "Σχεδιότυπο που ελέγχει πως αποθηκεύονται τα βιβλία"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "Πρόσθετη εξατομίκευση"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "Επικοινωνία με ένα ηλ.αναγνωστήριο."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "Λήψη των στοιχείων της συσκευής"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "Προσθήκη βιβλίων στον κατάλογο συνδεδομένων της συσκευής..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "Αφαίρεση βιβλίων από τον κατάλογο συνδεδομένων της συσκευής..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "Αποστολή συνδεδομένων στη συσκευή..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [παράμετροι] mybook.chm"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "Φάκελλος εξαγωγής. Αρχικά έχει καθοριστεί ο τρέχων φάκελλος"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr "Διεύθυνση ενός αρχείου txt που περιέχει κάποιο σχόλιο"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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 "Εξαγωγή εικονιδίου από αρχείο LRF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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."
@@ -874,24 +913,24 @@ msgstr ""
 "προκαθορισμένο εξώφυλλο, γι'αυτό χρησιμοποιούμε ευρετικές μεθόδους "
 "(heuristics) για να μαντέψουμε το εξώφυλλο."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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 "Καθορισμός ταυτότητας (ID) του βιβλίου"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr "Καθορισμός του δέλτα της γραμματοσειράς"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr "Ο/Η/Το %s επεξεργάσθηκε"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "Ο/Η/Το %s απέτυχε"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
@@ -901,7 +940,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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 "
@@ -911,24 +950,24 @@ msgstr ""
 "%default. Αν οι τιμή είναι μικρότερη από 256 μπορεί το κείμενο στη συσκευή "
 "σας να εμφανίζεται θολό αν δημιουργείτε τα κόμικς σας σε μορφότυπο EPUB."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "Απενεργοποίηση όξυνσης"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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."
@@ -936,13 +975,13 @@ msgstr ""
 "Απενεργοποίηση ψαλιδίσματος των σελίδων κόμικς. Σε κάποια κόμικς το "
 "ψαλίδισμα ενδέχεται να αφαιρέσει μέρος του περιεχομένου μαζί με τα περιθώρια"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:293
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 "Να μη διασπώνται οι οριζόντιες εικόνες (landscape) σε δύο κάθετες εικόνες "
 "(portrait)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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."
@@ -951,7 +990,7 @@ msgstr ""
 "πλάτος της εικόνας το ύψος της οθόνης, όταν η θέαση είναι οριζόντια "
 "(landscape)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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."
@@ -960,7 +999,7 @@ msgstr ""
 "όπως τα μάνγκα. Προκαλεί διάσπαση των οριζόντιων σελίδων (landscape) σε "
 "κάθετες σελίδες (portrait), από δεξιά προς αριστερά."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:302
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:302
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -968,7 +1007,7 @@ msgstr ""
 "Ενεργοποίηση Αποκηλίδωσης. Μειώνει το θόρυβο από μικροκηλίδες. Ο χρόνος "
 "επεξεργασίας μπορεί να αυξηθεί κατά πολύ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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."
@@ -976,7 +1015,7 @@ msgstr ""
 "Να μην ταξινομούνται ονομαστικά τα αρχεία που βρίσκονται σε ένα κόμικ. "
 "Αντ'αυτού να χρησιμοποιείται η σειρά με την οποία προστέθηκαν στο κόμικ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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 "
@@ -986,20 +1025,20 @@ msgstr ""
 "ηλ.βιβλίο. Μπορείτε να πειραματιστείτε για το ποιό μορφότυπο αποδίδει το "
 "βέλτιστο μέγεθος και εμφάνιση στη συσκευή σας."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "Να μην επεξεργαστεί η εικόνα"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315
 msgid "Do not convert the image to grayscale (black and white)"
 msgstr "Να μην μετατραπεί η εικόνα σε α/μ (grayscale)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -1050,32 +1089,32 @@ msgstr ""
 "\n"
 "Για την πλήρη τεκμηρίωση του συστήματος μετατροπής δείτε\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "ΠΑΡΑΜΕΤΡΟΙ ΕΙΣΑΓΩΓΗΣ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr ""
 "Παράμετροι για τον έλεγχο της επεξεργασίας του εισαγόμενου αρχείου %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "ΠΑΡΑΜΕΤΡΟΙ ΕΞΑΓΩΓΗΣ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "Παράμετροι για τον έλεγχο της επεξεργασίας του εξαγόμενου αρχείου %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "Έλεγχος αυτόματου εντοπισμού της δομής του εγγράφου"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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 "
@@ -1085,28 +1124,28 @@ msgstr ""
 "αρχείο προέλευσης έχει Πίνακα Περιεχομένων, αυτός θα χρησιμοποιηθεί κατά "
 "προτεραιότητα σε σχέση μ'εκείνον που παράγεται αυτόματα."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "Παράμετροι για τον καθορισμό των συνδεδομένων στα εξαγόμενα"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "Παράμετροι που βοηθούν στη διόρθωση (αποσφαλμάτωση) της μετατροπής"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "Κατάλογος ενσωματωμένων συνταγών"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr "Τα εξαγόμενα αποθηκεύτηκαν στον/στην"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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 "
@@ -1116,7 +1155,7 @@ msgstr ""
 "στον φάκελο που έχει προσδιοριστεί. Χρήσιμο όταν δε γνωρίζετε το ακριβές "
 "στάδιο της διαδικασίας μετατροπής όπου εμφανίζεται κάποιο σφάλμα."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1128,7 +1167,7 @@ msgstr ""
 "στο εισαγόμενο έγγραφο. Π.χ. αποστάσεις που εξαρτώνται από την ανάλυση "
 "(αποστάσεις σε pixels). Οι επιλογές είναι:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1142,7 +1181,7 @@ msgstr ""
 "να λειτουργούν σε μια συσκευή. Π.χ. το EPUB στο ηλ.αναγνωστήριο SONY. Οι "
 "επιλογές είναι:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1155,7 +1194,7 @@ msgstr ""
 "εξαγόμενα κείμενα και αντίστροφα. Αρχικά, το μέγεθος αναφοράς επιλέγεται "
 "βάσει του περιγράμματος εξαγωγής που επιλέξατε."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1171,11 +1210,11 @@ msgstr ""
 "τρόπο, τις γραμματοσειρές. Η αρχική αντιστοίχιση που χρησιμοποιείται "
 "εξαρτάται από το περίγραμμα εξαγωγής που επιλέξατε."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr "Απενεργοποίηση της επανακλιμάκωσης των μεγεθών των γραμματοσειρών."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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."
@@ -1183,7 +1222,7 @@ msgstr ""
 "Το ύψος γραμμής, σε σημεία (pts). Ελέγχει το διάστημα μεταξύ διαδοχικών "
 "γραμμών κειμένου. Αρχικά, δε γίνεται καμία αλλαγή στο ύψος γραμμής."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1196,7 +1235,7 @@ msgstr ""
 "παράμετρος εξαγάγει το περιεχόμενο απ'αυτούς τους πίνακες και το παρουσιάζει "
 "με γραμμικό τρόπο."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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 "
@@ -1206,7 +1245,7 @@ msgstr ""
 "προστεθούν στον Πίνακα Περιεχομένων στο πρώτο επίπεδο. Αν προσδιοριστεί, "
 "έχει προτεραιότητα έναντι άλλων μορφών αυτόματου εντοπισμού."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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 "
@@ -1216,7 +1255,7 @@ msgstr ""
 "προστεθούν στον Πίνακα Περιεχομένων στο δεύτερο επίπεδο. Κάθε καταχώρηση "
 "προστίθεται κάτω από την προηγούμενη καταχώρηση του πρώτου επιπέδου."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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 "
@@ -1226,7 +1265,7 @@ msgstr ""
 "προστεθούν στον Πίνακα Περιεχομένων στο τρίτο επίπεδο. Κάθε καταχώρηση "
 "προστίθεται κάτω από την προηγούμενη καταχώρηση του δεύτερου επιπέδου."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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 "
@@ -1236,13 +1275,13 @@ msgstr ""
 "χρησιμοποιείται αντί εκείνου που παράγεται αυτόματα. Μ'αυτή εδώ την "
 "παράμετρο, χρησιμοποιείται πάντα ο αυτόματα παραγόμενος."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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"
@@ -1250,7 +1289,7 @@ msgstr ""
 "Αν εντοπιστούν κεφάλαια λιγότερα απ'αυτόν εδώ τον αριθμό, να προστεθούν "
 "σύνδεσμοι στον Πίνακα Περιεχομένων. Αρχική τιμή : %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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 "
@@ -1261,7 +1300,7 @@ msgstr ""
 "λιγότερα κεφάλαια από την τιμή-όριο θα προστεθούν σύνδεσμοι στον Πίνακα "
 "Περιεχομένων."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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."
@@ -1270,7 +1309,7 @@ msgstr ""
 "ταιριάζουν σε μια προσδιορισμένη κανονική έκφραση. Οι καταχωρήσεις που "
 "ταιριάζουν και τα παιδιά τους αφαιρούνται."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1280,7 +1319,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1288,39 +1327,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1329,73 +1368,73 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1405,7 +1444,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1415,111 +1454,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1528,21 +1567,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1550,7 +1589,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1559,42 +1598,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1602,152 +1641,152 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /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/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1756,159 +1795,163 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "Εκδότης"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1922,120 +1965,120 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -2049,41 +2092,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -2091,166 +2134,162 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2258,32 +2297,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2295,114 +2334,114 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2411,33 +2450,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2452,90 +2491,96 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2543,296 +2588,443 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2841,135 +3033,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2977,105 +3169,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -3091,732 +3243,736 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3826,517 +3982,605 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4344,32 +4588,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4380,327 +4624,343 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4710,121 +4970,234 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4833,68 +5206,64 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4902,128 +5271,123 @@ msgid ""
 "below."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -5031,615 +5395,801 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5653,62 +6203,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5732,846 +6282,1005 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /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/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/sidebar.py:84
+msgid "Hide Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6587,204 +7296,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6792,7 +7507,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6802,93 +7517,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6896,735 +7607,745 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7633,150 +8354,150 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7784,45 +8505,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7831,7 +8563,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7839,14 +8571,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7855,14 +8587,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7871,28 +8603,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7901,7 +8633,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7911,27 +8643,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7940,61 +8672,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8003,43 +8729,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8048,11 +8774,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8061,15 +8787,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -8079,11 +8805,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8093,15 +8819,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -8114,11 +8840,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8129,27 +8855,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8160,23 +8886,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8187,30 +8913,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8222,17 +8948,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8241,19 +8967,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8263,15 +8989,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8283,111 +9009,127 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8395,7 +9137,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8403,7 +9145,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8411,422 +9153,500 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr "Δημιουργήθηκε απο τον "
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8835,6 +9655,12 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr ""
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Sony PRS-300/505/500."
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Sony PRS-600/700/900."
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index e3799a0ecb..73b9221a12 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-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-06-01 16:43+0000\n"
-"Last-Translator: WebTradis <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:52+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-02 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 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:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil está pensado para el Kindle DX de Amazon."
 
@@ -89,9 +89,9 @@ msgstr "No hace absolutamente nada"
 #: /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
@@ -119,8 +119,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -140,18 +140,18 @@ msgstr "No hace absolutamente nada"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -177,11 +177,11 @@ msgstr "Tipo de archivo"
 msgid "Metadata reader"
 msgstr "Lector de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Escritor de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Generador de catálogo"
 
@@ -301,7 +301,7 @@ msgstr ""
 "si no sabe nada del documento de entrada."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 ""
@@ -313,62 +313,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Este perfile está pensado para el Nook de B&N."
 
@@ -386,21 +386,21 @@ msgstr ""
 "si quiere generar un documento que pueda ser leido en el PC o en varios "
 "dispositivos diferentes."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr ""
 "Pensado para el Ipad y dispositivos similares con una resolución de 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 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:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Este perfil está pensado para el JetBook de 5 pulgadas."
 
@@ -484,51 +484,51 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunicar con teléfonos S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 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:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 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:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
 msgstr "Actualizando listado de meta datos..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "terminado"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 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:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /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:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -773,7 +773,7 @@ msgstr "No hay suficiente espacio libre en la tarjeta de almacenamiento"
 #: /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:1178
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Noticias"
@@ -2017,7 +2017,7 @@ msgid "Comments"
 msgstr "Comentarios"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2027,7 +2027,7 @@ msgid "Tags"
 msgstr "Etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2299,7 +2299,7 @@ msgstr ""
 "LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Portada"
 
@@ -2343,70 +2343,70 @@ msgstr "Todos los artículos"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Este es un libro Topaz de Amazon. No se puede procesar."
 
-#: /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 "Página de título"
 
-#: /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 "Índice"
 
-#: /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 "Índice analítico"
 
-#: /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 "Glosario"
 
-#: /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 "Agradecimientos"
 
-#: /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 "Bibliografía"
 
-#: /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 "Colofón"
 
-#: /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 "Copyright"
 
-#: /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 "Dedicatoria"
 
-#: /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 "Epígrafe"
 
-#: /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 "Prólogo"
 
-#: /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 "Lista de ilustraciones"
 
-#: /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 "Lista de tablas"
 
-#: /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 "Notas"
 
-#: /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 "Prefacio"
 
-#: /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 "Texto principal"
 
@@ -2972,20 +2972,24 @@ msgstr "Reemplazar el autor y el título con nuevos metadatos"
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limitar el número de tareas al número de CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /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:138
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Copiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Copiar al portapapeles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Escoger ficheros"
 
@@ -2993,41 +2997,41 @@ msgstr "Escoger ficheros"
 msgid "Searching in"
 msgstr "Buscando en"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Añadiendo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr "Buscando en todos los subdirectorios..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Error en la ruta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Sin libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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 "No se encontró ningún libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Añadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Fallo al añadir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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."
@@ -3036,11 +3040,11 @@ msgstr ""
 "calibre y añadir los libros en grupos más pequeños, hasta que encuentre el "
 "libro que causa el problema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "¡Se han encontrado duplicados!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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?"
@@ -3048,15 +3052,15 @@ msgstr ""
 "Ya existen libros con el mismo titulo que los siguientes en la base de "
 "datos. ¿Añadirlos de todas formas?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Añadiendo duplicados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Guardado"
 
@@ -3144,15 +3148,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -3161,6 +3165,8 @@ msgstr ""
 #: /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
@@ -3169,6 +3175,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/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
@@ -3276,8 +3284,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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr "Catálogo"
 
@@ -3999,22 +4007,22 @@ 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:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
+#: /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 "Elija el formato para visualizar"
 
-#: /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 ""
 "No se puede construir una expresión regular usando la interfaz gráfica sin "
 "un libro"
 
-#: /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 "No hay formatos disponibles"
 
-#: /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 "Abrir libro"
 
@@ -4785,168 +4793,168 @@ msgstr ""
 msgid "new email address"
 msgstr "nueva dirección de correo electrónico"
 
-#: /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 "System port selected"
 msgstr "Puerto de sistema seleccionado"
 
-#: /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 ""
 "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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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 "Error"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 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:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Herramientas de línea de órdenes instaladas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 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:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 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:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Elegir complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "El complemento no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 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:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Complemento no personalizable"
 
-#: /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: %s does not need customization"
 msgstr "Complemento: %s no necesita personalización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "No se puede eliminar el complemento incorporado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr "Registro de errores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Registro de accesos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 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:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Tamaño no válido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 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:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 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:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 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:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Debe ser un directorio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 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:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 msgid "Checking database integrity"
 msgstr "Comprobando la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 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:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "Se encontraron incoherencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -5083,13 +5091,13 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Enviar a &dispositivo"
 
-#: /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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5098,28 +5106,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:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 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:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 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:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 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:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 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:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5127,136 +5135,140 @@ 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:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " segundos"
 
-#: /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:537
 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:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "Normal"
 
-#: /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:539
 msgid "High"
 msgstr "Alta"
 
-#: /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:540
 msgid "Low"
 msgstr "Baja"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr "&Prioridad de tareas:"
 
-#: /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:542
 msgid "Preferred &output format:"
 msgstr "F&ormato de salida preferente:"
 
-#: /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:543
 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:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 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:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 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:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 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:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 "Mostrar explorador de &portadas en ventana separada (requiere reinicio)"
 
-#: /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:551
 msgid "Search as you type"
 msgstr "&Buscar mientras se escribe"
 
-#: /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 "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:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 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:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 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:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: /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 "Large"
 msgstr "Grande"
 
-#: /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 "Medium"
 msgstr "Medio"
 
-#: /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 "Small"
 msgstr "Pequeño"
 
-#: /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 "&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:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 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:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 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:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Remove a user-defined column"
 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:565
 msgid "Add a user-defined column"
 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 "Edit settings of a user-defined column"
 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 "Use internal &viewer for:"
 msgstr "&Usar visor interno para:"
 
-#: /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 "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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "&Añadir correo electrónico"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Asignar como pre&determinada"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "E&liminar correo electrónico"
 
-#: /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:575
 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-"
@@ -5266,33 +5278,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:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 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:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 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:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 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:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 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:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr "Depurar detección de &dispositivos"
 
-#: /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:582
 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 "
@@ -5303,25 +5315,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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "&Puerto del servidor:"
 
-#: /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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5329,7 +5341,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:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5337,41 +5349,41 @@ 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:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "&Tamaño máximo de portada:"
 
-#: /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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "&Detener servidor"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "Pro&bar servidor"
 
-#: /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:594
 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:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "Ver registros del &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:596
 #: /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 "
@@ -5388,7 +5400,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:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5396,27 +5408,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:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Activar/&Desactivar complemento"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "&Personalizar complemento"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "&Eliminar complemento"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Añadir nuevo complemento"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "&Fichero de complemento:"
 
-#: /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:605
 msgid "&Add"
 msgstr "&Añadir"
 
@@ -5870,7 +5882,7 @@ 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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr "Libros"
 
@@ -6070,6 +6082,39 @@ msgstr "Se necesita contraseña."
 msgid "Aborting..."
 msgstr "Abortando..."
 
+#: /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 "Es necesario un usuario y contraseña"
@@ -6320,29 +6365,28 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Elegir formatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Autores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr "Editoriales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /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:161
+#: /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
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
-msgstr "Editor de etiquetas"
+msgid "User Categories Editor"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
@@ -6389,6 +6433,7 @@ 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 "¿Está seguro?"
 
@@ -6400,6 +6445,10 @@ msgstr ""
 "Las siguientes etiquetas están en uno o más libros. ¿Está seguro de que "
 "quiere borrarlas?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr "Editor de etiquetas"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "Etiquetas disponibles"
@@ -6443,6 +6492,66 @@ msgstr ""
 "Añadir etiqueta a la lista de etiquetas disponibles y aplicarla al libro "
 "actual"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "Probar preferencias de correo electrónico"
@@ -6846,7 +6955,7 @@ msgstr "Libro <font face=\"serif\">%s</font> de %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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
@@ -6876,51 +6985,51 @@ msgstr ""
 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:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "No permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7003,68 +7112,72 @@ msgstr "Abrir libro electrónico"
 msgid "Configure"
 msgstr "Configurar"
 
-#: /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 "Usar la biblioteca de la ruta especificada."
 
-#: /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 "Iniciar el programa minimizado en la bandeja del sistema"
 
-#: /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 "Dirigir registro de depuración a la consola"
 
-#: /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 "No comprobar actualizaciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr "Error en la creación de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:75
+#: /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:145
+#: /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 "Reparación fallida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
 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:150
+#: /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:163
+#: /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:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Ubicación de la base de datos incorrecta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr "Base de datos corrupta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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 "
@@ -7074,50 +7187,54 @@ 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:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 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:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 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:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "No se puede iniciar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s ya está ejecutándose."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr "zona superior derecha de la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr "zona inferior derecha de la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "inténtelo después de reiniciar el equipo."
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "pruebe a borrar el fichero"
 
@@ -7239,7 +7356,7 @@ msgid "Send to device"
 msgstr "Enviar al dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Guardar en el disco"
 
@@ -7264,7 +7381,7 @@ msgid "C"
 msgstr "C"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Mostrar"
 
@@ -7442,11 +7559,44 @@ msgstr ""
 msgid "Cover browser could not be loaded: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:235
+#: /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
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Búsquedas"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -7490,83 +7640,83 @@ msgstr ""
 "Los siguientes libros ya han sido convertidos al formato %s. ¿Desea volver a "
 "convertirlos?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:68
+#: /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:155
+#: /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:161
+#: /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:184
+#: /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:201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Restaurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "&Donar para apoyar a calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "&Desconectar dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:274
+#: /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:276
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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)"
@@ -7575,7 +7725,7 @@ msgstr ""
 "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:298
+#: /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)"
@@ -7584,105 +7734,105 @@ msgstr ""
 "por directorio, se asume que cada fichero de libro electrónico es un libro "
 "diferente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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 "Guardar solamente el formato %s en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
+#: /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:368
+#: /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:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /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:414
+#: /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:417
+#: /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:433
+#: /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:473
+#: /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:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Guía de inicio rápido de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Explorar por portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "(todos los libros)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Conectado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "Base de datos del dispositivo corrupta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7712,150 +7862,150 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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 "Usar sólo la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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 "Usar anotaciones generadas sólo desde la biblioteca principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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 "No hay libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 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:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 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:1126
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 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:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 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:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 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:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 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:1165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 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:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "¿Cuantos libros vacios?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 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:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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 "Enviando libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "Libros en EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "Libros en LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "Libros en HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "Libros en LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "Libros en MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr "Libros en formato topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Libros en formato texto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "Libros en PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Cómics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Archivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "Libros soportados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "Se han unido algunos libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 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:1404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Fallo leyendo metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr "Fallo leyendo metadatos de"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "No se puede borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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 "No hay libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "Elegir formatos a borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 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:1494
+#: /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?"
@@ -7863,63 +8013,63 @@ 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:1511
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Eliminando libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "No se pueden descargar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "metadatos sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Descargando %s para %d libro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1599
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "No se pudieron descargar algunos metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1600
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr "No se pudieron descargar metadatos para:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "No se pudieron descargar metadatos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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 "No se pueden editar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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 "No se pueden unir los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 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:1681
+#: /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 "
@@ -7930,7 +8080,7 @@ msgstr ""
 "<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:1692
+#: /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 "
@@ -7946,47 +8096,47 @@ msgstr ""
 "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:1704
+#: /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 ""
 "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:1803
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "No se puede guardar en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Elegir directorio de destino"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Error al guardar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "Hubo un error al guardar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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 "No se pudieron guardar algunos libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 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:1870
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 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:1887
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "Generando catálogo %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -7994,44 +8144,44 @@ 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:1903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "Catálogo generado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "Directorio para exportar catálogos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "Seleccionar destino para %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1921
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Obteniendo noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " obtenidas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 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:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "No se puede visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2145
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Varios libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
+#: /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 "
@@ -8043,45 +8193,45 @@ msgstr ""
 "equipo. Una vez comenzado el proceso no puede deterse hasta que se complete. "
 "¿Desea continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
 msgid "Cannot open folder"
 msgstr "No se puede abrir la carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s no tiene formatos disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "No hay información detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Error de comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2343
+#: /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."
@@ -8089,12 +8239,12 @@ 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:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Error de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -8103,15 +8253,15 @@ msgstr ""
 "href=\"%s\">DRM</a>. Debe eliminar primero el DRM con herramientas de "
 "terceros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Receta deshabilitada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Fallo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -8120,11 +8270,11 @@ msgstr ""
 "lo encuentra útil, por favor, considere donar dinero para apoyar su "
 "desarrollo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8135,11 +8285,11 @@ msgstr ""
 "de datos en el dispositivo.<br>\n"
 "                      ¿Está seguro de que desea salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "AVISO: Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8147,7 +8297,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:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8155,11 +8305,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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Actualización disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -9609,7 +9759,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:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Mostrar información de salida detallada. Útil para la depuración"
 
@@ -9735,29 +9885,29 @@ msgstr ""
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 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:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Compactando la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Comprobando la integridad de SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Comprobando ficheros inexistentes."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "ID comprobado"
 
@@ -9980,10 +10130,13 @@ 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:124
 msgid "%d books"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
 msgstr ""
@@ -10253,88 +10406,88 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Fuente de noticias desconocida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Descarga finalizada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 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:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tEnlaces fallidos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Obteniendo canales de noticias..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 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:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Intentando descargar la portada..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Generando el rótulo:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando la descarga [%d proceso(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Canales de noticias descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "No se pudo descargar la portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Descargando la portada desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "Imagen del rótulo descargada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Artículo sin título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Artículo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Falló la descarga del artículo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Obteniendo canal de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10342,7 +10495,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:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -10365,7 +10518,7 @@ msgstr "Planificado"
 msgid "Custom"
 msgstr "Personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10375,12 +10528,12 @@ msgstr ""
 "\n"
 "Donde URL es por ejemplo http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 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:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10388,7 +10541,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:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10396,7 +10549,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:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10404,7 +10557,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:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10412,7 +10565,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:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10420,7 +10573,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:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -10431,7 +10584,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:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -10445,7 +10598,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:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "No descargar estilos CSS."
 
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index 0925f539f5..f0941036c6 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-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-05-31 21:32+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-05 22:22+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-01 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -70,9 +70,9 @@ msgstr "Ne fait strictement rien"
 #: /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,8 +100,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -121,18 +121,18 @@ msgstr "Ne fait strictement rien"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -158,11 +158,11 @@ msgstr "Type de fichier"
 msgid "Metadata reader"
 msgstr "Lecteur de métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Éditeur de métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Générateur de catalogue"
 
@@ -192,7 +192,7 @@ msgid ""
 msgstr ""
 "Créer une archive PMLZ, contenant le fichier PML et toutes les images, dans "
 "le répertoire pmlname_img ou images. Ce plugin est lancé à chaque ajout d'un "
-"fichier PML dans la librairie."
+"fichier PML dans la bibliothèque."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
@@ -282,7 +282,7 @@ msgstr ""
 "vous ne savez rien à propos du document d'entrée."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 "Ce profil est prévu pour les SONY PRS. Le 500/505/600/700 etc..."
@@ -292,62 +292,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Ce profil est prévu pour le Nook B&N."
 
@@ -365,25 +365,25 @@ msgstr ""
 "souhaitez générer un document que vous avez l'intention de lire sur un "
 "ordinateur ou  sur une gamme d'appareils."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr ""
 "Prévu pour l'iPad et les appareils semblables avec une résolution de 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 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:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 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:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -391,7 +391,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:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ce profil est prévu pour le Kindle DX d'Amazon."
 
@@ -413,7 +413,7 @@ msgstr "Plugins désactivés."
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
-msgstr "Absence de plugin valide "
+msgstr "Absence de plugin compatible dans "
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
@@ -478,54 +478,59 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Communiquer avec les téléphones S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 msgid "Communicate with iBooks through iTunes."
-msgstr ""
+msgstr "Communiquer avec iBooks à travers iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 msgid "Apple device detected, launching iTunes, please wait ..."
-msgstr ""
+msgstr "Appareil Apple détecté, lancement d'iTunes, veuillez patienter..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
-msgstr ""
+msgstr "Mise à jour de la liste des métadonnées de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d sur %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "Terminé"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"Des livres n'ont pas été trouvés dans la base de donnés d'iTunes.\n"
+"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:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /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:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 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/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -564,7 +569,7 @@ msgstr "Communiquer avec le lecteur d'ebook ESlick."
 #: /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 ""
+msgstr "Utiliser un fichier arbitraire comme appareil"
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
@@ -589,7 +594,7 @@ msgstr "Communiquer avec le lecteur d'ebook Hanvon N520."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
 msgid "Communicate with The Book reader."
-msgstr ""
+msgstr "Communiquer avec le lecteur The Book"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
 msgid "Communicate with the SpringDesign Alex eBook reader."
@@ -679,7 +684,7 @@ msgstr "Communique avec le lecteur d'ebook Sony PRS-500."
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
 msgid "Communicate with all the Sony eBook readers."
-msgstr ""
+msgstr "Communiquer avec tous les lecteurs d'eBook Sony"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
@@ -764,7 +769,7 @@ msgstr "Espace insuffisant sur la carte mémoire"
 #: /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:1178
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Informations"
@@ -1691,7 +1696,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
-msgstr ""
+msgstr "Démarrer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
@@ -1899,7 +1904,7 @@ msgstr "Convertir LRS en LRS, utile pour déboguer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
-msgstr "Fichier LRF invalide. Impossible d'indiquer les metadonnées."
+msgstr "Fichier LRF incorrect. Impossible d'indiquer les metadonnées."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
@@ -2032,7 +2037,7 @@ msgid "Comments"
 msgstr "Commentaires"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2042,7 +2047,7 @@ msgid "Tags"
 msgstr "Etiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2316,7 +2321,7 @@ msgstr ""
 "LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Couverture"
 
@@ -2361,70 +2366,70 @@ msgstr "Tous les articles"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "C'est un livre Amazon Topaz. Il ne peut pas être traité."
 
-#: /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 "Page de titre"
 
-#: /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 "Tables des matières"
 
-#: /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 "Index"
 
-#: /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 "Glossaire"
 
-#: /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 "Remerciements"
 
-#: /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 "Bibliographie"
 
-#: /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 "Marque de l'imprimeur"
 
-#: /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 "Copyright"
 
-#: /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 "Dédicace"
 
-#: /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 "Epigraphe"
 
-#: /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 "Avant-propos"
 
-#: /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 "Liste d'illustrations"
 
-#: /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 "Liste de Tables"
 
-#: /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 "Notes"
 
-#: /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 "Préface"
 
-#: /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 "Texte principal"
 
@@ -2518,7 +2523,7 @@ msgid ""
 msgstr ""
 "Echelle utilisée pour déterminer la longueur à partir de laquelle une ligne "
 "doit être déroulée. Les valeurs entrées doivent se situer entre 0 et 1, la "
-"valeur par défaut étant 0.5, ce qui est la longueur médiane."
+"valeur par défaut étant 0.5, ce qui représente la longueur médiane."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
@@ -2895,7 +2900,7 @@ msgstr "Taille de la barre d'icone"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
-msgstr "Affiche les libellés dans la barre d'outils"
+msgstr "Affiche les libellés des boutons dans la barre d'outils"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
@@ -2954,7 +2959,7 @@ msgstr "Envoyer les News téléchargées vers l'appareil"
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Delete books from library after uploading to device"
 msgstr ""
-"Supprimer les livres de la librairie après les avoir téléchargés dans "
+"Supprimer les livres de la bibliothèque après les avoir téléchargés dans "
 "l'appareil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
@@ -2991,20 +2996,24 @@ msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Limiter le nombre maximum de travaux simultanés au nombre de processeurs."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /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:138
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copié"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Copier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Copier dans le Presse-papiers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Choisir les fichiers"
 
@@ -3012,41 +3021,41 @@ msgstr "Choisir les fichiers"
 msgid "Searching in"
 msgstr "Recherche dans"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Ajout..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr "Cherche dans tous les sous-répertoires..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Chemin de l'erreur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Aucun livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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 "Aucun livre trouvé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Ajouté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "L'ajout a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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."
@@ -3055,11 +3064,11 @@ msgstr ""
 "redémarrer calibre et ajouter les livres avec un incrément plus petit, "
 "jusqu'à ce que vous trouviez le problème."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Des doublons ont été détectés !"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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?"
@@ -3067,46 +3076,46 @@ msgstr ""
 "Des livres avec des titres identiques à ceux qui suivent existent déjà la "
 "base. Voulez-vous quand-même les ajouter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Ajoute les dupliqués..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Sauvegarde..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Sauvegardé"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
 msgid "Searching for sub-folders"
-msgstr ""
+msgstr "Recherche des sous-dossiers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
 msgid "Searching for books"
-msgstr ""
+msgstr "Recherche des livres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
 msgid "Looking for duplicates based on file hash"
-msgstr ""
+msgstr "Recherche de doublons basée sur le condensat (hash) de fichier"
 
 #: /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 ""
+msgstr "Choisir le dossier racine"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
 msgid "Invalid root folder"
-msgstr ""
+msgstr "Dossier racine incorrect"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
 msgid "is not a valid root folder"
-msgstr ""
+msgstr "n'est pas un dossier racine correct"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
 msgid "Add books to calibre"
-msgstr ""
+msgstr "Ajouter des livres à Calibre"
 
 #: /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
@@ -3119,19 +3128,19 @@ msgstr "Page de l'assistant"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
 msgid "Scanning root folder for books"
-msgstr ""
+msgstr "Parcours le dossier racine à la recherche de livres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
 msgid "This may take a few minutes"
-msgstr ""
+msgstr "Ceci peut prendre quelques minutes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
 msgid "Choose the location to add books from"
-msgstr ""
+msgstr "Choisissez l'emplacement à partir duquel ajouter des livres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
 msgid "Select a folder on your hard disk"
-msgstr ""
+msgstr "Sélectionner un dossier de votre disque dur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
 msgid ""
@@ -3147,7 +3156,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
 msgid "&Root folder:"
-msgstr ""
+msgstr "&Dossier racine"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
 msgid ""
@@ -3163,15 +3172,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -3180,6 +3189,8 @@ msgstr ""
 #: /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
@@ -3188,6 +3199,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/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
@@ -3295,8 +3308,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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr "Catalogue"
 
@@ -3325,7 +3338,7 @@ msgid ""
 "- A regex pattern of a single dot excludes all genre tags, generating no "
 "Genre Section"
 msgstr ""
-"Astuces Regex:\n"
+"Astuces d'expressions régulières (regex):\n"
 "- La regex standard - \\[[\\w ]*\\] -exclue les étiquettes de genre de la "
 "forme [étiquette], e.g., [Amazon Freebie]\n"
 "- Un modèle de regex contenant un seul point exclue toutes les étiquettes de "
@@ -3457,7 +3470,7 @@ msgstr "Choisir le répertoire de débogage"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
-msgstr "Répertoire de débogage invalide"
+msgstr "Répertoire de débogage incorrect"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
@@ -3796,7 +3809,7 @@ msgstr "<p>Il y a eu une erreur à la lecture du fichier : <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
 msgid " is not a valid picture"
-msgstr " n'est pas une image vailde"
+msgstr " n'est pas une image compatible"
 
 #: /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
@@ -3842,8 +3855,8 @@ msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by a "
 "comma"
 msgstr ""
-"Modifie les auteurs du livres. Si plusieurs auteurs, les séparer avec des "
-"virgules."
+"Modifie le(s) auteur(s) de ce livre. Dans le cas d'auteurs multiples, "
+"séparer leurs noms par une virgule."
 
 #: /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
@@ -3863,8 +3876,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 ""
-"Tags caractérisant le livre, particulièrement utile pour la recherche. <br> "
-"<br> Cela peut être n'importe quels mots, séparés par des virgules."
+"Etiquettes caractérisant le livre, particulièrement utile pour les "
+"recherches. <br> <br> Celles-ci peuvent être formées de n'importe quels mots "
+"ou phrases, séparés par des virgules."
 
 #: /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
@@ -4010,28 +4024,28 @@ msgstr "&Orientation:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
-msgstr ""
+msgstr "Conserver les &proportions de la couverture"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr "Sortie RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
+#: /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 "Choisir le format à afficher"
 
-#: /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 ""
 "Impossible de créer l'expression régulière en utilisant le générateur sans "
 "avoir de livre"
 
-#: /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 "Aucun format disponible"
 
-#: /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 "Livre libre"
 
@@ -4111,22 +4125,22 @@ 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
 msgid "Invalid regular expression"
-msgstr "Expression régulière invalide"
+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
 msgid "Invalid regular expression: %s"
-msgstr "Expression régulière invalide: %s"
+msgstr "Expression régulière incorrecte: %s"
 
 #: /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 "XPath invalide"
+msgstr "XPath incorrect"
 
 #: /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 "L'expression XPath %s est invalide."
+msgstr "L'expression XPath %s est incorrecte."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
@@ -4224,7 +4238,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
 msgid "Preserve &spaces"
-msgstr ""
+msgstr "Conservers les &espaces"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
@@ -4251,7 +4265,7 @@ msgstr "Forcer la longueur de ligne maximale"
 #: /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 "TextLabel"
+msgstr "Libellé texte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
 msgid "Use a wizard to help construct the XPath expression"
@@ -4350,7 +4364,7 @@ msgstr ""
 #: /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 ""
+msgstr "Indéfini(e)"
 
 #: /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
@@ -4366,23 +4380,23 @@ msgstr "Non"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
 msgid "star(s)"
-msgstr ""
+msgstr "étoile(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
 msgid "Unrated"
-msgstr ""
+msgstr "Non noté"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
 msgid "Remove all tags"
-msgstr ""
+msgstr "Supprimer toutes les étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
 msgid "tags to add"
-msgstr ""
+msgstr "étiquettes à ajouter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
 msgid "tags to remove"
-msgstr ""
+msgstr "étiquettes à supprimer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
@@ -4442,7 +4456,7 @@ msgstr "Envoyer vers la mémoire du lecteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
-msgstr "Envoyer à la carte mémoire A"
+msgstr "Envoyer vers la carte mémoire A"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
@@ -4451,33 +4465,33 @@ 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
 msgid "Main Memory"
-msgstr ""
+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 ""
+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 ""
+msgstr "Carte mémoire B"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
 msgid "Send and delete from library"
-msgstr ""
+msgstr "Envoyer et effacer de la bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send specific format"
-msgstr ""
+msgstr "Envoyer un format spécifique"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
 msgid "Connect to folder"
-msgstr ""
+msgstr "Connecter au dossier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
 msgid "Disconnect from folder"
-msgstr ""
+msgstr "Déconnecter du dossier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
@@ -4719,7 +4733,7 @@ msgstr "&Profil :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41
 msgid "Edit Comments"
-msgstr ""
+msgstr "Editer les commentaires"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:173
 msgid "%(plugin_type)s %(plugins)s"
@@ -4759,7 +4773,7 @@ msgid ""
 "Delivery"
 msgstr ""
 "Envoi\n"
-"D'Email"
+"d'Email"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Advanced"
@@ -4802,170 +4816,172 @@ msgstr ""
 msgid "new email address"
 msgstr "Nouvelle adresse email"
 
-#: /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 "System port selected"
 msgstr "Port système sélectionné"
 
-#: /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 ""
 "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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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 "Erreur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 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:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Outils en ligne de commande installés."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 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:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
-msgstr "Pas de répertoire valide pour les plugins"
+msgstr "N'est pas un chemin correct pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
-msgstr "%s n'est pas un répertoire valide pour les plugins"
+msgstr "%s n'est pas un répertoire 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:570
 msgid "Choose plugin"
 msgstr "Choisir le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 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:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Le plugin ne peut pas être personnalisé"
 
-#: /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: %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:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Impossible de supprimer les plugins natifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 msgid "You must select a column to delete it"
-msgstr ""
+msgstr "Vous devez sélectionner une colonne pour pouvoir la supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 msgid "The selected column is not a custom column"
-msgstr ""
+msgstr "La colonne sélectionnée n'est pas une colonne personnalisée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr "Journal d'erreur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Journal des accès:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 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:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
-msgstr "Taille invalide"
+msgstr "Taille incorrecte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
-msgstr "La taille %s est invalide. Doit être au format largeurxhauteur"
+msgstr "La taille %s est incorrecte. Doit être au format largeurxhauteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
-msgstr "Le chemin de la base de données n'est pas valide"
+msgstr "Le chemin de la base de données n'est pas correct"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
-msgstr "Le chemin de la base de données n'est pas valide "
+msgstr "Le chemin de la base de données n'est pas correct "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Doit être un répertoire."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
-"Le chemin de la base de données n'est pas valide.<br>Erreur en écriture "
+"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:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
-msgstr ""
+msgstr "Redémarrage nécessaire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 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:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 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:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "Des incohérences ont été trouvées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4975,7 +4991,7 @@ msgstr ""
 "Les livres suivants ont des formats listés dans la base qui ne sont pas "
 "disponible actuellement. Les entrées pour les formats ont été supprimés. "
 "Vous devrez les vérifier manuellement. Ceci peut arriver si vous avez "
-"manipulé les fichiers directement dans le répertoire de la librairie."
+"manipulé les fichiers directement dans le répertoire de la bibliothèque."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
@@ -5101,13 +5117,13 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Envoi vers l'appareil"
 
-#: /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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5115,31 +5131,31 @@ msgstr ""
 "&Localisation des ebooks (Les ebooks sont stockés dans les répertoires 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:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 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:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 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:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 "Écraser l'auteur et le titre par défaut lors de la récupération des "
 "métadonnées"
 
-#: /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:534
 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:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5147,138 +5163,142 @@ 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:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " secondes"
 
-#: /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:537
 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:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "Normale"
 
-#: /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:539
 msgid "High"
 msgstr "Haute"
 
-#: /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:540
 msgid "Low"
 msgstr "Basse"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr "&Priorité du travail:"
 
-#: /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:542
 msgid "Preferred &output format:"
 msgstr "Format de &sortie préféré:"
 
-#: /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:543
 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:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 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:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
-"Ac&tiver l'affichage dans la zone de notification (redémarrage nécessaire)"
+"&Activer l'affichage dans la zone de notification (redémarrage nécessaire)"
 
-#: /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:548
 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:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 "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:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "Rechercher lors de la saisie"
 
-#: /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 "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:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
-"Supprimer les News de la librairie lorsque l'envoi est automatique vers "
+"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:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 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:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: /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 "Large"
 msgstr "Large"
 
-#: /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 "Medium"
 msgstr "Moyen"
 
-#: /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 "Small"
 msgstr "Petit"
 
-#: /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 "&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:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 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:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
-msgstr "Sélectionner les &colonnes visibles dans la vue librairie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
-msgid "Remove a user-defined column"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
-msgid "Add a user-defined column"
-msgstr ""
+msgstr "Sélectionner les &colonnes visibles dans la vue bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
-msgid "Edit settings of a user-defined column"
-msgstr ""
+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:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+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:567
+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:570
 msgid "Use internal &viewer for:"
 msgstr "Utiliser l'afficheur interne pour:"
 
-#: /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 "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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "&Ajouter un email"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Par &défaut"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "&Supprimer un email"
 
-#: /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:575
 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-"
@@ -5288,35 +5308,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:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 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:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 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:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 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:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 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:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 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:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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 "
@@ -5327,25 +5347,25 @@ msgstr ""
 "monde. Toutes modifications 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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "&Port du serveur:"
 
-#: /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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5353,7 +5373,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:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5361,41 +5381,41 @@ 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:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "Taille max. de la couverture:"
 
-#: /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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "Démarrer le &Serveur"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "Arrêter le Serveur"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "&Tester le serveur"
 
-#: /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:594
 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:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "Afficher les logs 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:596
 #: /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 "
@@ -5412,7 +5432,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:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5420,27 +5440,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:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Activer/Désactiver le plugin"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "Personnaliser le plugin"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "Supprimer le plugin"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Ajouter un nouveau plugin"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "&Fichier plugin:"
 
-#: /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:605
 msgid "&Add"
 msgstr "&Ajouter"
 
@@ -5498,7 +5518,7 @@ 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
 msgid "Text, column shown in the tag browser"
-msgstr ""
+msgstr "Texte, colonne affichée dans le navigateur d'étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
 msgid "Comma separated text, like tags, shown in the tag browser"
@@ -5510,31 +5530,32 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:29
 msgid "Floating point numbers"
-msgstr ""
+msgstr "Nombres à virgule flottante"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
 msgid "Integers"
-msgstr ""
+msgstr "Entiers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
 msgid "Ratings, shown with stars"
-msgstr ""
+msgstr "Notation, affichée à l'aide d'étoiles"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
 msgid "Yes/No"
-msgstr ""
+msgstr "Oui/Non"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
 msgid "No column selected"
-msgstr ""
+msgstr "Aucune colonne sélectionnée"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
 msgid "No column has been selected"
-msgstr ""
+msgstr "Aucune colonne n'a été sélectionnée"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
 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
 msgid "No lookup name was provided"
@@ -5544,42 +5565,48 @@ msgstr ""
 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"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
 msgid "No column heading was provided"
-msgstr ""
+msgstr "Aucun titre de colonne n'a été fourni"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
 msgid "The lookup name %s is already used"
-msgstr ""
+msgstr "Le nom recherché %s est déjà utilisé"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
 msgid "The heading %s is already used"
-msgstr ""
+msgstr "Le titre %s est déjà utilisé"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
 msgid ""
 "The lookup name must be lower case and cannot contain \":\"s or spaces"
 msgstr ""
+"Le nom recherché doit être en minuscules et ne peut pas contenir \":\"s ou "
+"des espaces"
 
 #: /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 ""
+msgstr "Créer ou éditer des colonnes personnalisées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:102
 msgid "&Lookup name"
-msgstr ""
+msgstr "&Nom recherché"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:103
 msgid "Column &heading"
-msgstr ""
+msgstr "Titre de colonne"
 
 #: /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 ""
+"Utilisé pour la recherche dans la colonne. Ne doit contenir que des chiffres "
+"et des lettres en minuscules."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
 msgid ""
@@ -5588,11 +5615,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
 msgid "Column &type"
-msgstr ""
+msgstr "&Type de colonne"
 
 #: /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 "Quel type d'informations sera conservé dans la colonne."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
 msgid ""
@@ -5604,18 +5631,25 @@ msgid ""
 "<li>dd MMMM yy gives 05 January 10</li>\n"
 "</ul> "
 msgstr ""
+"<p>Format de date. Utiliser 1-4 'd's pour le jour, 1-4 'M's pour le mois, et "
+"2 ou 4 'y's pour l'année.</p>\n"
+"<p>Par exemple:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy donne Lundi, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy donne 05 Janvier 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"
-msgstr ""
+msgstr "Utiliser MMM aaaa pour mois + année, aaaa pour l'année seule"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:115
 msgid "Default: dd MMM yyyy."
-msgstr ""
+msgstr "Par défaut: jj MMM aaaa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:116
 msgid "Format for &dates"
-msgstr ""
+msgstr "Format des &dates"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
@@ -5631,11 +5665,11 @@ msgstr "Déboguer la détection de l'appareil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
-msgstr "Modèle invalide"
+msgstr "Modèle incorrect"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
-msgstr "Le modèle %s est invalide:"
+msgstr "Le modèle %s est incorrect:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
@@ -5786,7 +5820,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
-msgstr "Editer les informations de Métadonnées"
+msgstr "Editer les informations sur les Métadonnées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
@@ -5839,7 +5873,7 @@ msgstr "Ouvre l'éditeur de mots-clefs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
-msgstr "&Supprime des étiquettes :"
+msgstr "&Supprime les étiquettes :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
 msgid "Comma separated list of tags to remove from the books. "
@@ -5884,23 +5918,23 @@ 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 ""
+msgstr "&Metadonnées de base"
 
 #: /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 "&Metadonnées personnalisées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125
 msgid "Not a valid picture"
-msgstr "N'est pas une image valide"
+msgstr "N'est pas une image correcte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
 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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr "Livres"
 
@@ -5936,7 +5970,7 @@ msgstr "Impossible de lire la couverture à partir du format %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:263
 msgid "The cover in the %s format is invalid"
-msgstr "La couverture du format %s est invalide"
+msgstr "La couverture au format %s est incompatible"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:300
 msgid "Abort the editing of all remaining books"
@@ -5945,11 +5979,11 @@ 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
 msgid "This ISBN number is valid"
-msgstr "Le numéro ISBN est valide"
+msgstr "Le numéro ISBN est correct"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
-msgstr "Le numéro ISBN est invalide"
+msgstr "Le numéro ISBN est incorrect"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
@@ -5982,7 +6016,7 @@ msgstr "Mauvaise couverture"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
-msgstr "La couverture n'est pas une image valide"
+msgstr "La couverture n'est pas une image"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
@@ -6018,7 +6052,7 @@ msgstr "Editer les métadonnées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
 msgid "Meta information"
-msgstr "Informations métadonnées"
+msgstr "Informations sur les Métadonnées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
@@ -6050,7 +6084,7 @@ msgstr "Publié:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "dd MMM yyyy"
-msgstr "dd MMM yyyy"
+msgstr "jj MMM aaaa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
 msgid "&Date:"
@@ -6101,6 +6135,41 @@ msgstr "Mot de passe nécessaire"
 msgid "Aborting..."
 msgstr "Abandon..."
 
+#: /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 ""
+"La recherche sauvegardée actuelle sera <b>définitivement supprimée</b>. Êtes-"
+"vous sûr ?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr "Editeur de recherche sauvegardée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr "Recherche sauvegardée: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr "Sélectionner une recherche sauvegardée à modifier"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr "Supprimer la recherche sauvegardée sélectionnée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr "Entrer un nouveau nom pour la recherche sauvegardée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr "Ajouter la nouvelle recherche sauvegardée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr "Modifier le contenu de la recherche sauvegardée"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
 msgstr "Nécessite un nom d'utilisateur et un mot de passe"
@@ -6354,33 +6423,32 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Choisir les formats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Auteurs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr "Editeurs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /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:161
+#: /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
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
-msgstr "Editeur de Mots-Clefs"
+msgid "User Categories Editor"
+msgstr "Editeur de catégories utilisateur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
-msgstr ""
+msgstr "Articles disponibles"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
 msgid "Apply tags to current tag category"
@@ -6396,33 +6464,35 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
 msgid "Category name: "
-msgstr ""
+msgstr "Nom de la catégorie: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
 msgid "Select a category to edit"
-msgstr ""
+msgstr "Sélectionner une catégorie à éditer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
 msgid "Delete this selected tag category"
-msgstr ""
+msgstr "Supprimer cette catégorie d'étiquette sélectionnée"
 
 #: /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 ""
+"Entrer un nouveau nom de catégorie. Sélectionner le genre avant de l'ajouter."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
 msgid "Add the new category"
-msgstr ""
+msgstr "Ajouter la nouvelle catégorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
 msgid "Category filter: "
-msgstr ""
+msgstr "Filtre de catégorie: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
 msgid "Select the content kind of the new category"
-msgstr ""
+msgstr "Sélectionner le type de contenu de la nouvelle catégorie"
 
 #: /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 "Êtes-vous sûr ?"
 
@@ -6434,6 +6504,10 @@ msgstr ""
 "Les étiquettes suivantes sont utilisées par un livre ou plus. Êtes-vous "
 "certain de vouloir les supprimer ?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr "Editeur de Mots-Clefs"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "Etiquettes disponibles"
@@ -6452,7 +6526,7 @@ msgstr "Applique le mot-clef au livre en cours."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
-msgstr "Mots-clefs"
+msgstr "Etiquettes appliquées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
@@ -6474,7 +6548,67 @@ 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 ""
-"Ajoute le mot-clef à la liste des mots-clefs et l'applique au livre en cours"
+"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:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
@@ -6540,7 +6674,7 @@ msgstr "Ce flux a déjà été ajouté à la recette"
 #: /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 "Entrée invalide"
+msgstr "Entrée incorrecte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:237
@@ -6853,7 +6987,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:47
 msgid "On Device"
-msgstr ""
+msgstr "Dans l'appareil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
@@ -6882,23 +7016,23 @@ msgstr "Livre <font face=\"serif\">%s</font> of %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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
-msgstr ""
+msgstr "Le nom recherché/consulté est \"{0}\""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
 msgid "In Library"
-msgstr ""
+msgstr "Dans la bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
 msgid "Size"
-msgstr ""
+msgstr "Taille"
 
 #: /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 ""
+msgstr "Collections"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
 msgid "Format"
@@ -6912,57 +7046,57 @@ msgstr ""
 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:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
-msgstr ""
+msgstr "Cacher la colonne %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
-msgid "Ascending"
-msgstr ""
+msgstr "Trier par %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr "Ascendant"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
-msgid "Change text alignment for %s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
-msgid "Left"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
-msgid "Right"
-msgstr ""
+msgstr "Descendant"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+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
+msgid "Left"
+msgstr "Gauche"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr "Droite"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
-msgstr ""
+msgstr "Centre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
-msgstr ""
+msgstr "Afficher la colonne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
-msgstr ""
+msgstr "Restorer l'affichage par défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Interdit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 "Déplacer vers un appareil n'est pas supporté. Ajouter d'abord le livre dans "
-"la librairie calibre."
+"la bibliothèque calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
@@ -7038,71 +7172,75 @@ msgstr "Ouvrir le livre"
 msgid "Configure"
 msgstr "Configurer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:28
-msgid "Use the library located at the specified path."
-msgstr "Utiliser la librairie présente dans le répertoire spécifié."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
+msgid "Use the library located at the specified path."
+msgstr "Utiliser la bibliothèque présente dans le répertoire spécifié."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
 msgid "Start minimized to system tray."
 msgstr "Démarrer en mode minimisé dans la zone de notification."
 
-#: /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 "Loggue les informations de débogage dans la console"
 
-#: /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 "Ne pas vérifier les mises à jour"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr "La création de la bibliothèque a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:75
+#: /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:145
+#: /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 "La réparation a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
 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:150
+#: /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 "Librairie calibre"
+msgstr "Bibliothèque calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /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:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Mauvais emplacement pour la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr "Base de données corrompue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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 "
@@ -7112,50 +7250,54 @@ 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:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 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:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 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:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "Impossible de lancer "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s est déjà démarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 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:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 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:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "Essayer de redémarrer l'ordinateur."
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "Essayer de supprimer le fichier"
 
@@ -7165,7 +7307,7 @@ msgstr "calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
 msgid "&Restrict to:"
-msgstr ""
+msgstr "&Limiter à:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
 msgid ""
@@ -7235,11 +7377,11 @@ msgstr "Toutes les correspondances"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
 msgid "Create, edit, and delete user categories"
-msgstr ""
+msgstr "Créer, éditer, et effacer les catégories définies par l'utilisateur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
 msgid "Manage &user categories"
-msgstr ""
+msgstr "Gérer &les catégories de l'utilisateur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
@@ -7268,7 +7410,7 @@ msgstr "E"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
-msgstr ""
+msgstr "Fusionner les enregistrements de livres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
@@ -7279,7 +7421,7 @@ msgid "Send to device"
 msgstr "Envoyer au lecteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Sauvegarder sur le disque"
 
@@ -7304,7 +7446,7 @@ msgid "C"
 msgstr "C"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Visualiser"
 
@@ -7452,27 +7594,27 @@ msgstr "Cliquer pour voir la liste des travaux actifs."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
 msgid "Hide Book Details"
-msgstr ""
+msgstr "Cacher les détails du Livre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
 msgid "Show Book Details"
-msgstr ""
+msgstr "Afficher les détails du Livre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
 msgid "Hide Tag Browser"
-msgstr ""
+msgstr "Cacher le navigateur d'Etiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
 msgid "Show Tag Browser"
-msgstr ""
+msgstr "Afficher le navigateur d'Etiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
 msgid "Hide Cover Browser"
-msgstr ""
+msgstr "Cacher le navigateur de Couvertures"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
 msgid "Show Cover Browser"
-msgstr ""
+msgstr "Afficher le navigateur de Couvertures"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:95
 msgid "Side bar"
@@ -7480,13 +7622,46 @@ msgstr ""
 
 #: /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:148
+msgid "Rename"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Recherches"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -7530,85 +7705,85 @@ 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:68
+#: /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:155
+#: /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:161
+#: /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:184
+#: /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:201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Montrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "&Donner pour supporter calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "&Ejecter l'appareil connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Redémarrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:274
+#: /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:276
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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)"
@@ -7616,7 +7791,7 @@ 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:298
+#: /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)"
@@ -7624,106 +7799,107 @@ 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:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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 "Sauvegarder seulement le format %s vers le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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 ""
+"Sauvegarder seulement le format %s sur le disque dans un repertoire unique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
+#: /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:368
+#: /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:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /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:414
+#: /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:417
+#: /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 librairie calibre"
+msgstr "Créer le catalogue des livres dans votre bibliothèque calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /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:473
+#: /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:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Guide De Démarrage Rapide Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
 msgid "Select folder to open as device"
-msgstr ""
+msgstr "Sélectionner le dossier à ouvrir comme appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Navigation par couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
 msgid "({0} of {1})"
-msgstr ""
+msgstr "({0} de {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "(tous les livres)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "({0} of all)"
-msgstr ""
+msgstr "({0} de tout)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Appareil: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " detecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Connecté: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "Base de données d'appareils corrompue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7752,152 +7928,152 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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 "Utiliser la librairie seulement"
+msgstr "Utiliser seulement la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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 ""
-"Annotations utilisateur générées à partir de la librairie principale "
+"Annotations utilisateur générées à partir de la bibliothèque principale "
 "uniquement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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 "Aucun livre sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 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:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 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:1126
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 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:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 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:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 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:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 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:1165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 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:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "Combien de livres vides?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 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:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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 "Téléchargement des livres vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "Livres EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "Livres LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "Livres HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "Livres LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "Livres MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr "Livres Topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Livres Texte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "Livres PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Bande Dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Archives"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "Livres supportés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "Fusionne des livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 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:1404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Impossible de lire les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 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:1425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "Impossible de supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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 "Aucun livre sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "Choisir les formats à supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 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:1494
+#: /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?"
@@ -7905,63 +8081,65 @@ 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:1511
+#: /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 ""
+"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:1526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Suppression des livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Impossible de télécharger les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "Métadonnées sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 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:1599
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 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:1600
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 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:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 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:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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 "Impossible d'éditer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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 "Impossible de fusionner les livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 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:1681
+#: /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 "
@@ -7973,7 +8151,7 @@ msgstr ""
 "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:1692
+#: /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 "
@@ -7990,7 +8168,7 @@ msgstr ""
 "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:1704
+#: /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?"
@@ -7998,40 +8176,40 @@ 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:1803
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Impossible de sauvegarder sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Choisir le répertoire de destination"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Erreur pendant la sauvegarde"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 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:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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 "Impossible de sauvegarder certains livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 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:1870
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 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:1887
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "Génère le catalogue %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -8039,44 +8217,44 @@ msgstr ""
 "Aucun livre vers le catalogue\n"
 "Vérifier les étiquettes d'exclusion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "Catalogue généré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "Répertoire d'export du catalogue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "Sélectionner la destination pour %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1921
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Récupération des News de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " récupéré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 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:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "Impossible de visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2145
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Plusieurs livres sélectionnés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
+#: /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 "
@@ -8088,45 +8266,45 @@ msgstr ""
 "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:2155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
 msgid "Cannot open folder"
 msgstr "Impossible d'ouvrir le répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s n'a pas de format disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 msgid "Cannot configure before calibre is restarted."
-msgstr ""
+msgstr "Configuration impossible avant que Calibre n'ait été redémarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Pas d'information détaillée disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
-msgstr ""
+msgstr "Echec"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2343
+#: /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."
@@ -8135,12 +8313,12 @@ msgstr ""
 "lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
 "électronique et redémarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Erreur lors de la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -8149,15 +8327,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:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Recette désactivée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Échoué</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -8166,11 +8344,11 @@ msgstr ""
 "Si vous le trouvez utile, pensez à donner afin de supporter son "
 "développement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8181,11 +8359,11 @@ msgstr ""
 "l'appareil.<br>\n"
 "                      Êtes-vous sûr de vouloir quitter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "ATTENTION: Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8193,7 +8371,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:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8201,11 +8379,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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Mise à jour disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -8705,7 +8883,7 @@ msgid ""
 "%d\n"
 "books"
 msgstr ""
-"Librairie\n"
+"Bibliothèque\n"
 "%d\n"
 "Livres"
 
@@ -8760,7 +8938,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
 msgid "Books located at"
-msgstr ""
+msgstr "Livres situés à"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
@@ -8807,34 +8985,34 @@ msgid ""
 "WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
 "address of the computer calibre is running on."
 msgstr ""
-"Vous devez ajouter l'URL http://nomhote:8080 comme librairie calibre dans "
+"Vous devez ajouter l'URL http://nomhote:8080 comme bibliothèque calibre dans "
 "WordPlayer. Ici nomhote doit être le nom d'hôte complet ou l'adresse IP du "
 "l'ordinateur où calibre est démarré."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
-msgstr "Déplace la librairie..."
+msgstr "Déplace la bibliothèque..."
 
 #: /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 "Le déplacement de la librairie a échoué."
+msgstr "Le déplacement de la bibliothèque a échoué."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
-msgstr "Base de données invalide"
+msgstr "Base de données incorrecte"
 
 #: /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 ""
-"<p>Une librairie invalide existe à %s,  la supprimer avant d'essayer de "
-"déplacer la librairie existante.<br>Erreur: %s"
+"<p>Une bibliothèque incorrecte existe à %s,  la supprimer avant d'essayer de "
+"déplacer la bibliothèque existante.<br>Erreur: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
-msgstr "Impossible de déplacer la librairie"
+msgstr "Impossible de déplacer la bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
@@ -8939,9 +9117,9 @@ msgid ""
 "location. If a calibre library already exists at the new location, calibre "
 "will switch to using it."
 msgstr ""
-"Si vous avez déjà une librairie Calibre, elle sera copiée vers ce nouvel "
-"emplacement. Si une librairie Calibre existe déjà à cet emplacement, Calibre "
-"basculera pour pouvoir l'utiliser."
+"Si vous avez déjà une bibliothèque Calibre, elle sera copiée vers ce nouvel "
+"emplacement. Si une bibliothèque Calibre existe déjà à cet emplacement, "
+"Calibre basculera pour pouvoir l'utiliser."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
@@ -9092,15 +9270,15 @@ msgstr "Démarrer le serveur de &contenu"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:256
 msgid "today"
-msgstr ""
+msgstr "Aujourd'hui"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:259
 msgid "yesterday"
-msgstr ""
+msgstr "Hier"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:262
 msgid "thismonth"
-msgstr ""
+msgstr "Ce mois-ci"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:265
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:266
@@ -9110,30 +9288,30 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:416
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:426
 msgid "no"
-msgstr ""
+msgstr "Non"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:416
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:426
 msgid "unchecked"
-msgstr ""
+msgstr "Non vérifié"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:419
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:429
 msgid "checked"
-msgstr ""
+msgstr "Vérifié"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:419
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:429
 msgid "yes"
-msgstr ""
+msgstr "Oui"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:423
 msgid "blank"
-msgstr ""
+msgstr "vierge"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:423
 msgid "empty"
-msgstr ""
+msgstr "Vide"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
 msgid ""
@@ -9286,8 +9464,8 @@ msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
-"Chemin de la librairie calibre. Par défaut : utilise celui indiqué dans les "
-"paramètres."
+"Chemin de la bibliothèque calibre. Par défaut : utilise celui indiqué dans "
+"les paramètres."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
@@ -9356,15 +9534,15 @@ msgid ""
 "folder."
 msgstr ""
 "Le préfixe pour tous les chemins. Par défaut : Le chemin absolu du "
-"répertoire de la librairie."
+"répertoire de la bibliothèque."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
-msgstr "Champs invalides. Champs disponibles:"
+msgstr "Champs incorrects. Champs disponibles:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
-msgstr "Champ de tri invalide. Champs disponibles:"
+msgstr "Champ de tri incorrect. Champs disponibles:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:244
 msgid ""
@@ -9618,7 +9796,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:573
 msgid "You must specify label, name and datatype"
-msgstr "Vous devez spécifier un label, un nom et un type de donnée"
+msgstr "Vous devez spécifier un libellé, un nom et un type de donnée"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:631
 msgid ""
@@ -9663,7 +9841,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:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Affiche des informations détaillées. Utile pour le débogage"
 
@@ -9715,8 +9893,8 @@ msgstr ""
 "\n"
 "    %prog colonnes_personnalisees [options]\n"
 "\n"
-"    Lister toutes les colonnes personnalisées. Affiche les labels de colonne "
-"et les identifiants.\n"
+"    Lister toutes les colonnes personnalisées. Affiche les libellés de "
+"colonne et les identifiants.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:736
@@ -9755,7 +9933,7 @@ msgstr "Ne pas demander de confirmation"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:774
 msgid "Error: You must specify a column label"
-msgstr "Erreur: Vous devez spécifier un label de colonne"
+msgstr "Erreur: Vous devez spécifier un libellé de colonne"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
@@ -9780,43 +9958,43 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:497
 msgid "Card A"
-msgstr ""
+msgstr "Carte A"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:499
 msgid "Card B"
-msgstr ""
+msgstr "Carte B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
-msgstr "<p>Migre l'ancienne base vers la librairie dans %s<br><center>"
+msgstr "<p>Migre l'ancienne base vers la bibliothèque dans %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Copie <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Compacte la base"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Vérifie l'intégrité SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Vérifie si des fichiers sont manquants."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "Id vérifié"
 
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
 msgid "Ratings"
-msgstr ""
+msgstr "Notes"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
@@ -9884,8 +10062,8 @@ msgid ""
 "in the calibre library. Makes saving to disk slower."
 msgstr ""
 "Normalement, calibre mettra à jour les métadonnées dans les fichiers "
-"sauvegardés à partir de ce qui est présent dans la librairie calibre. Cela "
-"fait que la sauvegarde sur disque est plus lente."
+"sauvegardés à partir de ce qui est présent dans la bibliothèque calibre. "
+"Cela fait que la sauvegarde sur disque est plus lente."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:57
 msgid ""
@@ -10010,7 +10188,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
-"Mot de passe pour accéder à la librairie calibre. Le nom d'utilisateur est "
+"Mot de passe pour accéder à la bibliothèque calibre. Le nom d'utilisateur "
+"est "
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
@@ -10025,7 +10204,7 @@ 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 ""
-"Chemin vers le répertoire de la librairie à utiliser avec le serveur de "
+"Chemin vers le répertoire de la bibliothèque à utiliser avec le serveur de "
 "contenu"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
@@ -10033,41 +10212,44 @@ 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:124
 msgid "%d books"
+msgstr "%d livres"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
-msgstr ""
+msgstr "NOTE: %s<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "TAGS: %s<br />"
-msgstr ""
+msgstr "ETIQUETTES: %s<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
 msgid "SERIES: %s [%s]<br />"
-msgstr ""
+msgstr "SERIES: %s [%s]<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
 msgid "Library"
-msgstr ""
+msgstr "Bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
 msgid "Books in your library"
-msgstr ""
+msgstr "Livres dans votre bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
 msgid "By "
-msgstr ""
+msgstr "Par "
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
 msgid "Books sorted by "
-msgstr ""
+msgstr "Livres classés par "
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
 msgid "Newest"
-msgstr ""
+msgstr "Le plus récent"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
@@ -10104,7 +10286,7 @@ msgstr "Timeout par défaut pour les opérations réseaux (en secondes)"
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:678
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
-"Chemin vers le répertoire où est enregistrée votre librairie de livres"
+"Chemin vers le répertoire où est enregistrée votre bibliothèque de livres"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:680
 msgid "The language in which to display the user interface"
@@ -10306,91 +10488,91 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Source de News inconnue"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Téléchargement effectué"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 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:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tLiens qui ont échoués:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Récupération des flux..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 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:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Essaie de télécharger la couverture..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Génération du masthead"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Commence le téléchargement [processus %d]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Flux téléchargés de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 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:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Télécharge la couverture de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 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:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Article sans titre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Article téléchargé : %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Impossible de télécharger l'article: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Récupération du flux"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10398,7 +10580,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:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -10419,9 +10601,9 @@ msgstr "Planifié"
 #: /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 "Client"
+msgstr "Personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10431,12 +10613,12 @@ msgstr ""
 "\n"
 "Où URL est par exemple http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 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:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10444,7 +10626,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:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10452,15 +10634,15 @@ 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:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 "Nombre maximum de fichiers à télécharger. Ceci ne sera valable que pour pour "
-"les fichiers à partir des étiquettes <a href>.Par défaut: %default"
+"les fichiers à partir des balises <a href>.Par défaut: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10468,7 +10650,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:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10476,7 +10658,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:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -10487,7 +10669,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:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -10502,7 +10684,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:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Ne pas télécharger les feuilles de style CSS."
 
diff --git a/src/calibre/translations/gl.po b/src/calibre/translations/gl.po
index 68d334857a..88107bf42f 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-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-06-03 10:46+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:41+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-04 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -70,9 +70,9 @@ msgstr "Non facer nada"
 #: /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,8 +100,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -121,18 +121,18 @@ msgstr "Non facer nada"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -158,11 +158,11 @@ msgstr "Tipo de ficheiro"
 msgid "Metadata reader"
 msgstr "Lector de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Editor de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Xerador de catálogos"
 
@@ -281,7 +281,7 @@ msgstr ""
 "non sabe nada sobre o documento de entrada."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 ""
@@ -292,62 +292,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Este perfil é o propio para o B&N Nook."
 
@@ -365,25 +365,25 @@ msgstr ""
 "quere producir un documento apropiado para ser lido nun computador ou noutro "
 "tipo de dispositivos."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr ""
 "Sangrado para o iPad ou dispositivos semellantes cunha resolución de 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 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:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 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:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -391,7 +391,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:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil é o propio o Amazon Kindle DX."
 
@@ -478,51 +478,51 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunicar con teléfonos S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 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:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 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:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
 msgstr "Actualizando a relación de metadatos..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "ramtouse"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 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:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /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:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -765,7 +765,7 @@ msgstr "O espazo libre na tarxeta de memoria é insuficiente"
 #: /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:1178
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Noticias"
@@ -1986,7 +1986,7 @@ msgid "Comments"
 msgstr "Comentarios"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -1996,7 +1996,7 @@ msgid "Tags"
 msgstr "Etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2254,7 +2254,7 @@ msgstr ""
 "LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Capa"
 
@@ -2298,70 +2298,70 @@ msgstr "Todos os artigos"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Este é un libro Topaz de Amazon. Por tanto, non se pode procesar."
 
-#: /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 "Páxina de título"
 
-#: /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 "Índice de Contidos"
 
-#: /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 "Índice"
 
-#: /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 "Glosario"
 
-#: /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 "Agradecementos"
 
-#: /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 "Bibliografia"
 
-#: /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 "Colofón"
 
-#: /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 "Dereitos de copia"
 
-#: /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 "Dedicatoria"
 
-#: /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 "Epígrafe"
 
-#: /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 "Prólogo"
 
-#: /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 "Lista de Ilustracións"
 
-#: /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 "Lista de Táboas"
 
-#: /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 "Notas"
 
-#: /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 "Prefacio"
 
-#: /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 "Texto Principal"
 
@@ -2380,7 +2380,8 @@ msgstr "Envoltorio do Libro"
 #: /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 "Non se achou un punto razoábel en que partir: %s Sub-tree size: %d KB"
+msgstr ""
+"Non se achou un punto razoábel en que partir: %s Sub-tree size: %d KB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
@@ -2901,20 +2902,24 @@ msgstr ""
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /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:138
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Copiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Copiar no Portapapeis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Escoller os Ficheiros"
 
@@ -2922,65 +2927,65 @@ msgstr "Escoller os Ficheiros"
 msgid "Searching in"
 msgstr "A Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "A engadir..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /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:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Erro no camiño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Sen libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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 "Non se acharon libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Engadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Erro ao engadir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Acháronse duplicados!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "A engadir os duplicados..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "A gardar..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Gardado"
 
@@ -3068,15 +3073,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -3085,6 +3090,8 @@ msgstr ""
 #: /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
@@ -3093,6 +3100,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/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
@@ -3200,8 +3209,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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr ""
 
@@ -3881,20 +3890,20 @@ msgstr ""
 msgid "RB Output"
 msgstr "Saída RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
+#: /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 "Escoller o formato de visualización"
 
-#: /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 "Non hai formatos dispoñíbeis"
 
-#: /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 "Abrir o libro"
 
@@ -4622,165 +4631,165 @@ 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 "System port selected"
 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 ""
 "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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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 "Erro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "O camiño do engadido non é correcto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 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: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4891,271 +4900,275 @@ msgstr ""
 msgid "Sending to &device"
 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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 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:531
 msgid "Show notification when &new version is available"
 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:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 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:533
 msgid "&Overwrite author and title by default when fetching metadata"
 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:534
 msgid "Default network &timeout:"
 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:535
 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:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 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:537
 msgid "Choose &language (requires restart):"
 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:538
 msgid "Normal"
 msgstr "Normal"
 
-#: /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:539
 msgid "High"
 msgstr "Alto"
 
-#: /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:540
 msgid "Low"
 msgstr "Baixo"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /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:542
 msgid "Preferred &output format:"
 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:543
 msgid "Preferred &input format order:"
 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:546
 msgid "Use &Roman numerals for series number"
 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:547
 msgid "Enable system &tray icon (needs restart)"
 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:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
-msgid "Show cover &browser in a separate window (needs restart)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
-msgid "Search as you type"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
-msgid "Automatically send downloaded &news to ebook reader"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
-msgid "&Delete news from library when it is automatically sent to reader"
+msgid "Show &splash screen at startup"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
-msgid "&Number of covers to show in browse mode (needs restart):"
+msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-msgid "Toolbar"
+msgid "Search as you type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
-msgid "Large"
-msgstr "Grande"
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
-msgid "Medium"
-msgstr "Medio"
+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:554
-msgid "Small"
-msgstr "Pequeno"
+msgid "&Number of covers to show in browse mode (needs restart):"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
-msgid "&Button size in toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+msgid "Large"
+msgstr "Grande"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+msgid "Medium"
+msgstr "Medio"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+msgid "Small"
+msgstr "Pequeno"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+msgid "&Button size in toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 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 "Select visible &columns in library view"
 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 "Remove a user-defined column"
 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:565
 msgid "Add a user-defined column"
 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 "Edit settings of a user-defined column"
 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 "Use internal &viewer for:"
 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 "Add an email address to which to send books"
 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:572
 msgid "&Add email"
 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:573
 msgid "Make &default"
 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:574
 msgid "&Remove email"
 msgstr "&Quitar correo"
 
-#: /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:575
 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:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 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:577
 msgid "&Check database integrity"
 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:578
 msgid "&Install command line tools"
 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:579
 msgid "Open calibre &configuration directory"
 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:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /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:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /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:582
 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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 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:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 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:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 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:591
 msgid "&Start Server"
 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:592
 msgid "St&op Server"
 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:593
 msgid "&Test Server"
 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:594
 msgid "Run server &automatically on startup"
 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:595
 msgid "View &server logs"
 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:596
 #: /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 +5179,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:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 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:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 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:600
 msgid "&Customize plugin"
 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:601
 msgid "&Remove plugin"
 msgstr "&Quitar engadido"
 
-#: /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:602
 msgid "Add new plugin"
 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:603
 msgid "Plugin &file:"
 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:605
 msgid "&Add"
 msgstr ""
 
@@ -5625,7 +5638,7 @@ 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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr ""
 
@@ -5816,6 +5829,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 ""
@@ -6050,28 +6096,27 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Escoller formatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Autores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /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:161
+#: /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
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
+msgid "User Categories Editor"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
@@ -6119,6 +6164,7 @@ 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 ""
 
@@ -6128,6 +6174,10 @@ msgid ""
 "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 ""
@@ -6164,6 +6214,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:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr ""
@@ -6532,7 +6642,7 @@ msgstr ""
 
 #: /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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
@@ -6562,51 +6672,51 @@ msgstr ""
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Non permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6686,111 +6796,119 @@ msgstr ""
 msgid "Configure"
 msgstr "Configurar"
 
-#: /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
+#: /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:74
+#: /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:75
+#: /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:145
+#: /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:146
+#: /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:150
+#: /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 do Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 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:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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:206
 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:219
 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:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 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:281
 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:283
 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:285
 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:288
 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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
@@ -6908,7 +7026,7 @@ msgid "Send to device"
 msgstr "Enviar ao dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Gardar no disco"
 
@@ -6933,7 +7051,7 @@ msgid "C"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Ver"
 
@@ -7108,11 +7226,44 @@ msgstr ""
 msgid "Cover browser could not be loaded: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:235
+#: /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
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -7152,193 +7303,193 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:68
+#: /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:155
+#: /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:161
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:184
+#: /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:201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:274
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:276
+#: /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:278
+#: /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:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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:298
+#: /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:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:368
+#: /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:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:417
+#: /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:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Conectado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7354,210 +7505,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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 "Usar só a biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1126
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1494
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1511
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1599
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1600
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1681
+#: /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 "
@@ -7565,7 +7716,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1692
+#: /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 "
@@ -7575,89 +7726,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:1704
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1803
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Non é posíbel gardar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1870
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1887
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1921
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Obtendo novas de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2145
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
+#: /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 "
@@ -7665,106 +7816,106 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2343
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "Aviso: traballos en activo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -8989,7 +9140,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -9082,27 +9233,27 @@ msgstr ""
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "A copiar <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "A compactar a base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "A comprobar a integridade SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "A comprobar os ficheiros perdidos."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "id comprobada"
 
@@ -9286,10 +9437,13 @@ 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:124
 msgid "%d books"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
 msgstr ""
@@ -9549,93 +9703,93 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Fonte de Novas Descoñecida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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:692
 msgid "Download finished"
 msgstr "Rematou a descarga"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 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:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " desde "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tLigazóns erradas:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:842
 msgid "Fetching feeds..."
 msgstr "A obter os fluxos..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 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:853
 msgid "Trying to download cover..."
 msgstr "Tratando de descargar a capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 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:936
 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:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Fluxos descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Non se puido descargar a capa: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "A descargar a capa desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Artigo sen Título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Artigo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Erro ao descargar o artigo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "A obter o fluxo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 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:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -9656,55 +9810,55 @@ msgstr "Programado"
 msgid "Custom"
 msgstr "Personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 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:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 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:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 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:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -9713,7 +9867,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 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 31cbc9d93e..08bee86d27 100644
--- a/src/calibre/translations/he.po
+++ b/src/calibre/translations/he.po
@@ -7,166 +7,166 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:27+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:47+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-05-30 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "לא עושה דבר"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "בסיס"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "סוג קובץ"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "בדיקת תגיות מטא"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "כתיבת תגיות מטא"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "יצירת קטלוג"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 "
@@ -175,70 +175,70 @@ msgstr ""
 "עקוב אחר כל הקישורים המקומיים בקובץ HTML וצור קובץ ZIP המכיל את כל הקבצים "
 "המקושרים. תוסף זה רץ בכל פעם שמתווסף קובץ HTML לספרייה."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "חלץ עטיפה מקובץ קומיקס"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "קרא תגיות מטא מספרים בקובץ ארכיון RAR"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "קרא תגיות מטא מספרים בקובץ ארכיון ZIP"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "כתוב תגיות מטא מ- %s קבצים"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "קובץ מקור להמרה"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -248,11 +248,11 @@ msgstr ""
 "ציין את סוג הקידוד של קובץ המקור. בחירה זו תביא לביטול הגדרת הקידוד מהקובץ. "
 "שימושי למסמכים שאין בהם הגדרת קידוד או הגדרות קידוד שגויות"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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."
@@ -260,11 +260,11 @@ msgstr ""
 "אם מוגדר ,רכיב ההמרה ינסה ליצור קובץ קריא ככל האפשר.עלול לא להשפיע כלל עבור "
 "רכיבים מסויימים."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "פרופיל קלט"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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."
@@ -272,81 +272,81 @@ msgstr ""
 "פרופיל זה מנסה להגדיר ברירות מחדל סבירות והוא יעיל אם אינך יודע דבר אודות "
 "מקור המסמך."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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 line מדגמים 500/505/600/700 ועוד."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:69
+#: /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/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "פרופיל זה מיועד עבור SONY PRS-900."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "פרופיל זה מיועד עבור Microsoft Reader"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "פרופיל זה מיועד עבור Mobipocket books."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "פרופיל זה מיועד עבור Hanlin V3 ומכשירים דומים."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "פרופיל זה מיועד עבור Hanlin V5 ומכשירים דומים"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "פרופיל זה מיועד עבור Cybook G3."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "פרופיל זה מיועד עבור Cybook Opus."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "פרופיל זה מיועד עבור Amazon Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "פרופיל זה מיועד עבור Irex Illiad."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "פרופיל זה מיועד עבור IRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "פרופיל זה מיועד עבור IRex Digital Reader 800"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "פרופיל זה מיועד עבור B&N Nook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "פרופיל פלט"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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 "
@@ -355,24 +355,24 @@ msgstr ""
 "פרופיל זה מנסה לת ברירות מחדל סבירות והוא יעיל במידה ואתה רוצה להפיק מסמך "
 "שנועד להקרא במחשב או על מגוון מכשירים."
 
-#: /home/kovid/work/trunk/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 "מיועד ל-iPad ומכשירים דומים עם רזולוציה של 768x1024"
 
-#: /home/kovid/work/trunk/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 "פרופיל זה מיועד ל-Kobo Reader"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "פרופיל זה מיועד למכשיר SONY PRS-300."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "פרופיל זה מיועד למכשיר 5-inch JetBook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -380,35 +380,35 @@ msgstr ""
 "פרופיל זה מיועד למכשיר מקו SONY PRS. ה- 500/505/700 וכדומה בתצוגה "
 "אופקית.שימושי במיוחד עבור קומיקס."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "פרופיל זה מיועד למכשיר Amazon Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "תוספים מותקנים"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "תוספים מבוטלים"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "לא נמצאו תוספים תקינים ב- "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -416,455 +416,494 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "הוסף רכיב  על ידי הגדרת הנתיב לקובץ ZIP המכיל אותו."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "הסר רכיב מותאם לפי שם. ללא השפעה על הרכיבים המותקנים בהתקנה ראשונית."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "התאמת רכיב. ציין שם רכיב ומחרוזת התאמה מופרדים על ידי פסיק."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "הצג את כל הרכיבים המותקנים."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "מתקשר עם טלפון Android."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+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."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "מתקשר עם  Blackberry smart phone."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr "מחליף נתונים עם Cybook Gen 3 / Opus eBook reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "מחליף נתונים עם EB600 eBook reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr "מתקשר עם מכשיר Entourage Edge"
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "מחליף נתונים עם ESlick eBook reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "מחליף נתונים עם Hanlin V3 eBook readers."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "מחליף נתונים עם Hanlin V5 eBook readers."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "מחליף נתונים עם BOOX eBook reader."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "מחליף נתונים עם Hanvon N520 eBook reader."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "מתקשר עם  SpringDesign Alex eBook reader."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr "מתקשר עם מכשיר Azbooka"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "מחליף נתונים עם Elonex EB 511 eBook reader."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "מחליף נתונים עם IRex Iliad eBook reader."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "מחליף נתונים עם Hanlin V3 eBook readers."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "מחליף נתונים עם Hanlin V5 eBook readers."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+msgstr "מחליף נתונים עם BOOX eBook reader."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr "מחליף נתונים עם Hanvon N520 eBook reader."
+
+#: /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 eBook reader."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
+msgid "Communicate with the Azbooka"
+msgstr "מתקשר עם מכשיר Azbooka"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr "מחליף נתונים עם Elonex EB 511 eBook reader."
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "מתקשר עם - IRex Digital Reader 1000 eBook reader"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "מכשיר ה-Nook"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "מתקשר עם Nook eBook reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "מתקשר עם Nuut2 eBook reader"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/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:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "מתקשר עם Sony PRS-300/505/500 eBook reader."
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "מעביר ספרים למכשיר"
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "מסיר ספרים מהמכשיר"
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "שולח מטא תגיות למכשיר"
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "לא מצליח למצוא את כונן %s. נסה לאתחל את המכשיר."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "לא מצליח למצוא את כונן %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr "לא מצליח למצוא את כונן %s. המעבד מיצא גרסה נפרדת של SYSFS"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "לא מצליח להעלות זכרון ראשי (קוד שגיאה: %d)"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr "למכשיר אין כרטיס זיכרון בחריץ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "החריץ הנבחר: %s לא נתמך."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "אין מספיק מקום פנוי על הזכרון הראשי."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "אין מספיק מקום פנוי על כרטיס הזכרון."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "חדשות"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "קבע תצורת מכשיר"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "הגדרות דרייברים למכשיר."
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr "רשימת סוגי קבצים שהמכשיר מסוגל לקבל."
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "קרא מטר תגיות מקבצים במכשיר."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "תבנית לשליטה על אפשרויות שמירת ספרים."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "הגדרות נוספות"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "מחליף נתונים עם eBook reader"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "מקבל מידע ממכשיר..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "מוסיף ספרים לרשימת הספרים במכשיר"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "מסיר ספרים מרשימת הספרים במכשיר"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+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/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "תיקיה לפלט (ברירת מחדל - תיקייה נוכחית)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr "נתיב לקובץ TXT המכיל הערה."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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 ""
 "חלץ את העטיפה מתוך קובץ ה-LRF. (משתמש בכללי אצבע לקביעת תמונת העטיפה)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "%s נכשל"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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 "
@@ -873,54 +912,54 @@ msgstr ""
 "מספר גווני אפור להמרת התמונה. ברירת מחדל: %default. ערכים קטנים מ-256 עלולים "
 "לגרום למריחה בקומיקס בפורמט EPUB."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "בטל חידוד התמונה."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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 "
@@ -928,20 +967,20 @@ msgid ""
 msgstr ""
 "הפורמט אליו יומרו התמונות ב-eBook. ניתן לבדוק פורמטים שונים לתוצאה אופטימלית."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "אל תפעיל עיבוד על התמונה."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -967,65 +1006,65 @@ msgid ""
 "For full documentation of the conversion system see\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "אפשרויות יבוא"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr "אפשרותיות לשליטה בעיבוד %s קבצים מיובאים"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "אפשרויות יצוא"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "אפשרותיות לשליטה בעיבוד %s קבצים מיוצאים"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "שליטה באפשרויות גילוי אוטומטי של מבנה מסמך"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1033,7 +1072,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1041,7 +1080,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1049,7 +1088,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1058,17 +1097,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1076,58 +1115,58 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1137,7 +1176,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1145,39 +1184,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1186,73 +1225,73 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1262,7 +1301,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1272,111 +1311,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1385,21 +1424,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1407,7 +1446,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1416,42 +1455,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1459,152 +1498,152 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /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/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1613,159 +1652,163 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1779,120 +1822,120 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1906,41 +1949,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -1948,166 +1991,162 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2115,32 +2154,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2152,114 +2191,114 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2268,33 +2307,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2309,90 +2348,96 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2400,296 +2445,443 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2698,135 +2890,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2834,105 +3026,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -2948,732 +3100,736 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3683,517 +3839,605 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4201,32 +4445,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4237,327 +4481,343 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4567,121 +4827,234 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4690,68 +5063,64 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4759,128 +5128,123 @@ msgid ""
 "below."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -4888,615 +5252,801 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5510,62 +6060,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5589,846 +6139,1005 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /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/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/sidebar.py:84
+msgid "Hide Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6444,204 +7153,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6649,7 +7364,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6659,93 +7374,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6753,735 +7464,745 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7490,150 +8211,150 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7641,45 +8362,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7688,7 +8420,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7696,14 +8428,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7712,14 +8444,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7728,28 +8460,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7758,7 +8490,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7768,27 +8500,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7797,61 +8529,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7860,43 +8586,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7905,11 +8631,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7918,15 +8644,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7936,11 +8662,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -7950,15 +8676,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7971,11 +8697,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -7986,27 +8712,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8017,23 +8743,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8044,30 +8770,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8079,17 +8805,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8098,19 +8824,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8120,15 +8846,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8140,111 +8866,127 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8252,7 +8994,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8260,7 +9002,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8268,353 +9010,431 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -8622,45 +9442,45 @@ msgstr ""
 "אין לך הרשאה להוריד פריט זה. ניצלת את מכסת ההורדות להיום או שפג תוקפו של "
 "חשבונך"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -8668,27 +9488,27 @@ msgstr ""
 "מקסימום קבצים להורדה. רק לגבי קבצים מתגיות <a href>. ברירת המחדל היא "
 "%default ."
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "פרק הזמן בין הורדות. ברירת המחדל היא %default שניות."
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8697,6 +9517,9 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "לא להוריד דפי-סגנון CSS"
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "מתקשר עם Sony PRS-300/505/500 eBook reader."
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 95509ad285..3051da4a16 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-05-16 04:18+0000\n"
-"PO-Revision-Date: 2010-05-07 18:09+0000\n"
-"Last-Translator: Matteo Piotto <piotto@gmail.com>\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-05 17:48+0000\n"
+"Last-Translator: usa_getta <Unknown>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-20 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:32+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,9 +30,7 @@ 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/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/usbms/driver.py:347
 #: /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
@@ -45,9 +43,11 @@ msgstr "Non fa assolutamente niente"
 #: /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: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/book/base.py:20
 #: /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
@@ -56,9 +56,8 @@ msgstr "Non fa assolutamente niente"
 #: /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/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
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -74,9 +73,9 @@ msgstr "Non fa assolutamente niente"
 #: /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 +99,48 @@ msgstr "Non fa assolutamente niente"
 #: /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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
 #: /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: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/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:489
+#: /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/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: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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 #: /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,11 +161,11 @@ msgstr "Tipo di file"
 msgid "Metadata reader"
 msgstr "Lettore metadati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Scrittore metadati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Generatore del catalogo"
 
@@ -284,7 +284,7 @@ msgstr ""
 "nulla sul documento di origine."
 
 #: /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 ""
@@ -296,62 +296,62 @@ msgid "This profile is intended for the SONY PRS 300."
 msgstr "Questo profilo è adatto per il 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:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Questo profilo è adatto per il 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:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Questo profilo è adatto per il 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:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Questo profilo è adatto per i libri in formato Mobipocket."
 
 #: /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:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Questo profilo è adatto per l'Hanlin V3 ed i suoi cloni."
 
 #: /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:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Questo profilo è adatto per Hanlin V5 e i suoi cloni."
 
 #: /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:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "Questo profilo è adatto per il 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:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Questo profilo è adatto per il 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:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Questo profilo è adatto per il Kindle di Amazon."
 
 #: /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:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Questo profilo è adatto per l'Irex di 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:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Questo profilo è adatto per l'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:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Il profilo è adatto per l'IRex Digital Reader 800"
 
 #: /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:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Questo profilo è adatto per il Nook B&N."
 
@@ -369,33 +369,38 @@ msgstr ""
 "produrre un documento che dovrebbe essere letto tramite computer o su vari "
 "dispositivi di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:269
-msgid "This profile is intended for the Kobo Reader."
-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 "Inteso per iPad e simili dispositivi con una risoluzione di 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:281
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
+msgid "This profile is intended for the Kobo Reader."
+msgstr "Questo profilo e' inteso per il dispositivo Kobo Reader"
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Questo profilo è adatto per il Sony PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:299
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Questo profilo è adatto per il JetBook 5-inch."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:308
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr ""
-"Questo profilo è adatto per la linea SONY PRS. Il 500/505/700 ecc, in "
+"Questo profilo è adatto per la linea SONY PRS. Il 500/505/700 etc., in "
 "modalità landscape. Utile principalmente per i fumetti."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:406
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Questo profilo è adatto per il Kindle DX di Amazon."
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
-msgstr "Plug-in installati"
+msgstr "Plugin installati"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
@@ -407,7 +412,7 @@ msgstr "Personalizzazione dei plug-in locali"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
-msgstr "Disabilita plug-in"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
@@ -463,7 +468,7 @@ msgstr "Disabilita il plug-in"
 msgid "Communicate with Android phones."
 msgstr "Comunica con i telefoni 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"
@@ -471,10 +476,60 @@ msgstr ""
 "Listato delle cartelle in formato separato da virgole da inviare come e-book "
 "al dispositivo di lettura. Si uerá Il primo nella lista esistente."
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Comunica con il dispositivo di lettura Binatone Readme"
@@ -509,15 +564,25 @@ msgstr "Comunica con Entourage Edge"
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Comunica con l'ESlick 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 ""
+
+#: /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 "Interfaccia del Dispositivo"
+
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
 msgstr "Comunica con i lettori Hanlin V3."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:95
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
 msgid "Communicate with Hanlin V5 eBook readers."
 msgstr "Comunica con i lettori Hanlin V5."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:114
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunica con i lettori BOOX."
 
@@ -525,15 +590,19 @@ msgstr "Comunica con i lettori BOOX."
 msgid "Communicate with the Hanvon N520 eBook reader."
 msgstr "Comunica con il dispositivo di lettura 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 ""
+
+#: /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: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 "Comunica con il Elonex EB 511 eBook reader"
 
@@ -547,10 +616,6 @@ msgstr "Comunica con il lettore eBook IRex Iliad."
 msgid "John Schember"
 msgstr "John Schember"
 
-#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
-msgid "Device Interface"
-msgstr "Interfaccia del Dispositivo"
-
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
 msgstr "Comunica con il lettore eBook IRex Digital Reader."
@@ -571,23 +636,23 @@ msgstr "Comunicare con il JetBook eBook reader"
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Comunicare con il Kindle eBook reader"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Comunicare con il Kindle 2 eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Comunicazione in corso con in 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 ""
 
 #: /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 ""
 
@@ -615,26 +680,11 @@ msgstr "Comunicare con il Nuut2 eBook reader."
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Comunicare con il Sony PRS-500 eBook reader."
 
-#: /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..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
+msgid "Communicate with all the Sony eBook readers."
 msgstr ""
-"Reperimento della lista dei libri sul dispositivo di lettura in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "Comunicazione in corso con il 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: "
@@ -642,28 +692,10 @@ 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/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 "Trasferimento dei libri nel dispositivo di lettura in corso..."
-
-#: /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 "Rimozione dei libri dal dispositivo di lettura in corso..."
-
-#: /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 "Invio dei metadata al dispositivo di lettura in corso..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "Comunica con il Sony PRS-600/700/900 eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "Senza nome"
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
@@ -673,24 +705,32 @@ msgstr ""
 msgid "Communicate with the Teclast K3 reader."
 msgstr "Comunica con il Teclast K3 reader."
 
-#: /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:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Impossibile individuare il disco %s. Provare a riavviare."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:425
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Impossibile individuare il %s mount Point. Provo ad effettuare un reboot"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:490
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "Impossibile rilevare il disco %s."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:583
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "Non é stato possibile trovare l'assistente di installazione: %s"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:595
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -698,35 +738,36 @@ msgstr ""
 "mpossibile rilevare il disco %s. Il kernel in uso sta probabilmente "
 "esportando una versione obsoleta di SYSFS."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:603
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Impossibile montare la memoria principale (Codice errore: %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:744
 msgid "The reader has no storage card in this slot."
 msgstr "Il reader non contiene una scheda di memoria in questo slot."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "Lo slot selezionato: %s non è supportato."
 
-#: /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 in main memory"
 msgstr "Non c'è spazio sufficiente nella memoria principale"
 
-#: /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:783
 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: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
+#: /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 "Notizie"
 
@@ -734,15 +775,6 @@ msgstr "Notizie"
 msgid "Configure Device"
 msgstr "Configura il dispositivo di lettura"
 
-#: /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/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/usbms/deviceconfig.py:32
 msgid "Place files in sub directories if the device supports them"
 msgstr ""
@@ -766,23 +798,47 @@ msgstr "Ulteriori personalizzazioni"
 msgid "Communicate with an eBook reader."
 msgstr "Comunicare wcon un eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "Reperimento informazioni del dispositivo di lettura in corso..."
 
-#: /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: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
+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
+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
 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:165
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 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
+msgid "Sending metadata to device..."
+msgstr "Invio dei metadata al dispositivo di lettura in corso..."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [opzioni] mybook.chm"
@@ -1082,13 +1138,13 @@ msgstr "Creare lista delle formule del sistema"
 msgid "Output saved to"
 msgstr "Output salvato in"
 
-#: /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 ""
 "Livello di dettagli dell'output. Specificare piu' istanze per maggiori "
 "dettagli."
 
-#: /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 "
@@ -1098,7 +1154,7 @@ msgstr ""
 "directory specificata. Utile se non si e' sicuri in quale stadio del "
 "processo di conversione appare il bug"
 
-#: /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. "
@@ -1110,7 +1166,7 @@ msgstr ""
 "input. Per esempio lunghezze dipendenti dalla risoluzione (es. lunghezze in "
 "pixel). Le scelte sono:"
 
-#: /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 "
@@ -1123,7 +1179,7 @@ msgstr ""
 "richiesto per produrre documenti leggibili da un determinato dispositivo. "
 "per esempio EPUB su un lettore SONY. Le scelte sono:"
 
-#: /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 "
@@ -1136,7 +1192,7 @@ msgstr ""
 "viceversa. Per default, la dimensione base dei Font e' scelta in base al "
 "profilo scelto"
 
-#: /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-"
@@ -1152,11 +1208,11 @@ msgstr ""
 "predefinito é di utilizzare un modello basato sul tipo di output di vostra "
 "scelata."
 
-#: /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 "Disabilita il ridimensionamento delle dimensioni dei Font"
 
-#: /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."
@@ -1164,7 +1220,7 @@ msgstr ""
 "Altezza della linea in pts. Controlla lo spazio fra due linee di testo "
 "consecutive. Per default, nessuna variazione dell'altezza viene eseguita."
 
-#: /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 "
@@ -1176,7 +1232,7 @@ msgstr ""
 "presentano testi non allineati nella pagina ed altri difetti grafici. Questa "
 "opzione estrae il contenuto dalle tabelle e lo presenta in maniera lineare."
 
-#: /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 "
@@ -1186,7 +1242,7 @@ msgstr ""
 "sommario al primo livello. Se viene specificata, prende la precedenza sulle "
 "altre forme di autorilevamento."
 
-#: /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 "
@@ -1196,7 +1252,7 @@ msgstr ""
 "sommario al secondo livello. Ogni elemento viene aggiunto sotto l'elemento "
 "di primo livello precedente."
 
-#: /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 "
@@ -1206,7 +1262,7 @@ msgstr ""
 "tavola dei contenuti al terzo livello. Ogni istanza é aggiunta come il "
 "livello due che la precede."
 
-#: /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 "
@@ -1216,11 +1272,11 @@ msgstr ""
 "Contents), esso è usato di preferenza rispetto a quello auto-generato. Con "
 "questa opzione, verrà sempre usato l'indice auto-generato."
 
-#: /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 "Non aggiungere i capitoli rilevati automaticamente al sommario."
 
-#: /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"
@@ -1228,7 +1284,7 @@ msgstr ""
 "Se viene rilevato un numero di capitoli inferiore a questo, i collegamenti "
 "saranno aggiunti al sommario. Predefinito: %default"
 
-#: /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 "
@@ -1239,7 +1295,7 @@ msgstr ""
 "all'Indice soltanto se non è già stato raggiunto il numero di capitoli "
 "impostati."
 
-#: /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."
@@ -1248,7 +1304,7 @@ msgstr ""
 "corrisponde alla espressione specificata. Le voci che corrispondono saranno "
 "rimosse insieme alle voci \"figlie\"."
 
-#: /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 "
@@ -1265,7 +1321,7 @@ msgstr ""
 "capitoli usare l'espressione \"/\". Per maggiori informazioni riferirsi alla "
 "guida su XPath nel manuale di Calibre."
 
-#: /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 "
@@ -1278,7 +1334,7 @@ msgstr ""
 "marcatura dei capitoli e il valore \"both\" userà sia l'interruzione di "
 "pagina che la linea per marcare i capitoli."
 
-#: /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 "
@@ -1289,42 +1345,42 @@ msgstr ""
 "sorgente e pertanto puó essere usato per avere precedenza sulle regle giá "
 "definite."
 
-#: /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 ""
 "Una espression XPath. Interruzioni di pagina sono inserite prima degli "
 "elementi specificati."
 
-#: /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 ""
 "Imposta il margine superiore in pts. Il default e' %default. Nota: 72 pts "
 "equivalgono a 1 inch (circa (2,54 cm)"
 
-#: /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 ""
 "Imposta il margine inferiore in pts. Il default e' %default. Nota: 72 pts "
 "equivalgono a 1 inch (circa (2,54 cm)"
 
-#: /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 ""
 "Imposta il margine sinistro in pts. Il default e' %default. Nota: 72 pts "
 "equivalgono a 1 inch (circa (2,54 cm)"
 
-#: /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 ""
 "Imposta il margine destro in pts. Il default e' %default. Nota: 72 pts "
 "equivalgono a 1 inch (circa (2,54 cm)"
 
-#: /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 "
@@ -1333,7 +1389,7 @@ 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 "
@@ -1343,7 +1399,7 @@ msgstr ""
 "paragrafi di 1.5em. Rimuover gli spazi non avrá alcun effetto se il "
 "documento sorgente non usa notazione per i paragrafi del tipo <p> o <div>."
 
-#: /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. "
@@ -1353,7 +1409,7 @@ msgstr ""
 "automaticamente un incavo di paragrafo, per assicurarsi che i paragrafi "
 "siano ben distinti. questa opzione controlla l'ampiezza dell'incavo."
 
-#: /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."
@@ -1361,7 +1417,7 @@ msgstr ""
 "Usare la copertina rilevata dal file di origine al posto di quella "
 "specificata."
 
-#: /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)."
@@ -1369,7 +1425,7 @@ msgstr ""
 "Inserisce una linea vuota tra i paragrafi. Non funziona se il file sorgente "
 "non usa paragrafi ( tag <p> o <div> )"
 
-#: /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."
@@ -1377,7 +1433,7 @@ msgstr ""
 "Rimuovi la prima immagine dall'ebook di input. Utile se la prima immagine "
 "del file sorgente e' una copertina e si sta indicando una copertina esterna."
 
-#: /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."
@@ -1385,7 +1441,7 @@ msgstr ""
 "Inserisce i metadata del libro all'inizio. Utile se il dispositivo di "
 "lettura non supporta direttamente la visualizzazione/ricerca di metadata."
 
-#: /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."
@@ -1394,24 +1450,24 @@ msgstr ""
 "problemi nel file sorgente. Usare con cautela perche' potrebbe peggiorare la "
 "situazione."
 
-#: /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 ""
 "Utilizza una espressione regolare per provare a rimuovere la testata."
 
-#: /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 "L'espressione regolare da usare per rimuovere la testata."
 
-#: /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 "Utilizza una espressione regolare per provare a rimuovere il piede."
 
-#: /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 "L'espressione regolare da usare per rimuovere il piede di pagina."
 
-#: /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."
@@ -1419,7 +1475,7 @@ msgstr ""
 "Legge i metadata dal file OPF specificato. I metadata letti da questo file "
 "sovrascrivono qualunque altro metadata presente nel file sorgente."
 
-#: /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 "
@@ -1436,110 +1492,120 @@ msgstr ""
 "rappresentazione usata dal maggior numero di persone viene utilizzata (e.g. "
 "il cinese nell'ultimo esempio)."
 
-#: /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 "Imposta il titolo."
 
-#: /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 ""
 "Imposta gli Autori. Autori multipli devono essere separati da \"&\" senza "
 "virgolette."
 
-#: /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 "la versione del titolo che sara' usata per l'ordinamento. "
 
-#: /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 "Stinga che sara' usata quando si ordina per autore. "
 
-#: /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 "Seleziona la copertina da un file o da un URL"
 
-#: /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 "Imposta la descrizione dell'ebook"
 
-#: /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 "Imposta il publisher dell'ebook"
 
-#: /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 "Imposta la serie alla quale l'ebook appartiene"
 
-#: /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 "Imposta l'indice del libro in questa serie"
 
-#: /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 "Imposta il rating.  Deve essere un numero compreso tra 1 e 5"
 
-#: /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 "Imposta il codice ISBN del libro"
 
-#: /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 ""
 "Imposta i tags per il libro. Deve eessere una lista separata da virgole."
 
-#: /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 "Imposta il produttore del libro."
 
-#: /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 "Imposta la lingua."
 
-#: /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 "Imposta la data di pubblicazione"
 
-#: /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 ""
 "Imposta la data del libro (usata nella colonna della data in calibre)"
 
-#: /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 "Impossibile trovare un libro dentro l'archivio"
 
-#: /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 ""
 "I valori di index della serie e il rating devomo essere numerici. Ignorato"
 
-#: /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 "Errore nell'interpretare la data/orario"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:788
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr "Conversione dell'inputi in HTML in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:815
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr "Transcodifica di un ebook in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:902
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr "Creazione in corso"
 
-#: /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."
@@ -1548,7 +1614,7 @@ msgstr ""
 "Usare con cautela, il contenuto della directory sarà cancellato preima di "
 "ricevere i dati."
 
-#: /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 "
@@ -1564,7 +1630,7 @@ msgstr ""
 "un gran numero di interruzioni di pagina, é consigliato di disattivare la "
 "suddivisione alle interruzioni di pagina."
 
-#: /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 "
@@ -1575,7 +1641,7 @@ msgstr ""
 "grandi dimensioni. Il default di %defaultKB e' la dimensione richiesta per "
 "Adobe Digital Editions."
 
-#: /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 "
@@ -1585,7 +1651,7 @@ msgstr ""
 "specificata una, viene generata una copertina di default con il titolo, "
 "l'autore, etc. Questa opzione disabilita la generazione di questa copertina."
 
-#: /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 "
@@ -1593,6 +1659,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
@@ -1892,80 +1971,84 @@ msgstr "La famiglia di caratteri a spaziatura fissa da includere"
 msgid "Comic"
 msgstr "Comic"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:363
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
 #: /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/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: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
 msgid "Title"
 msgstr "Titolo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /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.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:48
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "Autore(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:365
+#: /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.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:53
 msgid "Publisher"
 msgstr "Editore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produttore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:367
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
 #: /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: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
 msgid "Comments"
 msgstr "Commenti"
 
-#: /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: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: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
 msgid "Tags"
 msgstr "Tag"
 
-#: /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: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: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
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "Lingua"
 
-#: /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:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
+#: /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.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:51
 msgid "Published"
 msgstr "Pubblicato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "Privilegi"
 
@@ -2097,35 +2180,35 @@ msgstr "Copertina salvata in"
 msgid "No cover found"
 msgstr "Nessuna copertina trovata"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Scarica i metadati"
 
-#: /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 "Valutazioni"
 
-#: /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 "etichette"
 
-#: /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 "Descrizione/Rassegne"
 
-#: /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 "scaricamento di %s da %s"
 
-#: /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 "Scarica i metadati da 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 "Scarica i metadati da 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."
@@ -2133,7 +2216,7 @@ msgstr ""
 "Per utilizzare isbndb.com é necessario registrarsi per un %sfree account%s "
 "utilizzando il vostro codice di accesso indicato in basso."
 
-#: /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 "Scaricare i metadati sociali da amazon.com."
 
@@ -2211,8 +2294,8 @@ msgstr ""
 "Scarica un'immagine di copertina per il libro identificato dall'ISBN da "
 "LibraryThing.com\n"
 
-#: /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:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Copertina"
 
@@ -2254,74 +2337,74 @@ msgstr "Tutti gli articoli"
 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 "Pagina iniziale"
 
-#: /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 "Sommario"
 
-#: /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 "Indice"
 
-#: /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 "Glossario"
 
-#: /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 "Ringraziamenti"
 
-#: /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 "Bibliografia"
 
-#: /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 "Colophon"
 
-#: /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 "Diritti d'autore"
 
-#: /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 "Dedica"
 
-#: /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 "Epigrafe"
 
-#: /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 "Premessa"
 
-#: /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 "Indice delle figure"
 
-#: /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 "Indice delle tabelle"
 
-#: /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 "Note"
 
-#: /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 "Prefazione"
 
-#: /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 "Corpo del testo"
 
-#: /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 "I libri nel formato %s non sono supportati"
 
@@ -2340,10 +2423,6 @@ msgstr ""
 "Impossibile trovare un buon punto dove dividere: %s Dimensione sotto-albero: "
 "%d KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "Senza nome"
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr "Opzioni per creare OPF/NCX/etc."
@@ -2369,7 +2448,7 @@ msgstr "Menu a lato"
 
 #: /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."
@@ -2380,7 +2459,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+ "
@@ -2684,6 +2763,12 @@ msgstr ""
 "L'orientazione della pagina. Il valore predefinito é ritratto. Le opzioni "
 "sono %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 ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr "Impossibile trovare pdftohtml, verificare che sia nel proprio PATH"
@@ -2722,7 +2807,13 @@ msgstr ""
 "1 é il valore piu basso di compressione, ma il piú veloce, e 10 é il piú "
 "alto valore di compressione, ma il piú lento."
 
-#: /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"
@@ -2730,7 +2821,7 @@ msgstr ""
 "Analizzare il testo sorgente utilizzando il pre-processore markdown. Per "
 "maggiori informazioni su markdown vedere"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Non inserire la tabella dei contenuti nel testo di output."
 
@@ -2776,85 +2867,85 @@ msgstr ""
 "linea quando non esistono spazi. Inoltre permette di specificare l valore "
 "della massima lunghezza di linea al di sotto del minimo (25 caratteri)"
 
-#: /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 ""
 "Invia il file alla scheda di memoria invece che alla memoria principale come "
 "impostazione predefinita"
 
-#: /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 "Chiedi conferma prima di eliminare"
 
-#: /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 "Dimensione bottoni nella barra degli strumenti"
 
-#: /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 "Mostra testo nei bottoni della barra degli strumenti"
 
-#: /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 "Geometria della finestra principale"
 
-#: /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 "Avverti quando è disponibile una nuova versione"
 
-#: /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 "Usa numeri romani per i numeri delle serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr "Ordina la lista dei tag per popolarità"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Numero di copertine da visualizzare nella modalità di sfogliatura copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr "Parametri predefiniti per la conversione in LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr "Opzioni del lettore di libri LRF"
 
-#: /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 "Formati visualizzati utilizzando il lettore interno"
 
-#: /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 "Colonne da mostrare nella lista dei libri"
 
-#: /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 ""
 "Avvia automaticamente il server dei contenuti quando si apre l'applicazione"
 
-#: /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 "Notizie più vecchie da mantenere nel database"
 
-#: /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 "Mostra un'icona nel vassoio di sistema"
 
-#: /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 "Invia le notizie scaricate al dispositivo di lettura"
 
-#: /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 ""
 "Elimina i libri dalla biblioteca dopo averle caricate sul dispositivo di "
 "lettura"
 
-#: /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"
@@ -2862,46 +2953,50 @@ msgstr ""
 "Fai vedere la vetrina delle copertine in una finestra separata invece della "
 "finestra prinicpale di Calibre."
 
-#: /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 "Disabilita messaggi dall'icona nella barra di sistema"
 
-#: /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 ""
 "Azione predefinita da attuare quando si seleziona il tasto di invio al "
 "dispositivo di lettura."
 
-#: /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 "Limite masimo di processi in attesa"
 
-#: /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 "Scaricare metadati sociali (categorie/valutazioni/etc.)"
 
-#: /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 "Usa i nuovi meta-dati per cambiare l'autore e il titolo"
 
-#: /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 "Limita il massimo numero di job simultanei al numero delle CPU."
 
-#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Copia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Copia negli appunti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Seleziona documenti"
 
@@ -2909,41 +3004,41 @@ msgstr "Seleziona documenti"
 msgid "Searching in"
 msgstr "Cercando in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Aggiungendo..."
 
-#: /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 "Cercando in tutte le sotto cartelle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Errore di percorso"
 
-#: /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 "Non é possibile elaborare la cartella indicata."
 
-#: /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:599
 msgid "No books"
 msgstr "Nessun libro."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1822
+#: /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 "Nessun libro trovato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Aggiunto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "L' aggiunta é fallita"
 
-#: /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."
@@ -2952,11 +3047,11 @@ msgstr ""
 "di far ripartire Calibre e aggiungere i libri in incrementi piu' piccoli, "
 "fino a quando si indentifica il libro che causa il problema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Scoperti duplicati!"
 
-#: /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?"
@@ -2964,18 +3059,161 @@ msgstr ""
 "Libri con lo stesso titolo sono giá presenti nella lista. Volete aggiungere "
 "in ogni caso?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Aggiunta dei duplicati..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Salvataggio..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Salvato"
 
+#: /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 "Pagina dell'assistente"
+
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "Opzioni CSV/XML"
@@ -3016,10 +3254,10 @@ msgstr "output"
 #: /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
@@ -3027,11 +3265,11 @@ msgstr "output"
 #: /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
@@ -3052,9 +3290,9 @@ msgid "E-book options"
 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: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:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr "Catalogo"
 
@@ -3232,46 +3470,6 @@ msgstr ""
 "conversione e tentare di razionalizzare i parametri di conversione come per "
 "le tavole dei contenuti e l'identificazione automatica dei capitoli."
 
-#: /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 "
@@ -3287,26 +3485,30 @@ msgstr ""
 msgid "EPUB Output"
 msgstr "Output EPUB"
 
-#: /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 "Non &spezzare nelle interruzioni di pagina."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:46
-msgid "Split files &larger than:"
-msgstr "Dividere documenti più &grandi di:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:47
-msgid " KB"
-msgstr " KB"
-
-#: /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 "Non esiste una &copetina predefinita"
 
-#: /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 "Nessuna cover &SVG"
 
+#: /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 "Dividere documenti più &grandi di:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
+msgid " KB"
+msgstr " KB"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr "Input FB2"
@@ -3369,15 +3571,15 @@ msgid "&Base font size:"
 msgstr "&Base Grandezza dei caratteri"
 
 #: /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 "Grandezza dei caratteri &key:"
 
 #: /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
@@ -3416,36 +3618,48 @@ msgstr "Visualizzazione"
 msgid "Control the look and feel of the output"
 msgstr "Controlla l'aspetto dell'output"
 
-#: /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 "&Disattiva l'aggiustamento proporzionale dei caratteri"
 
-#: /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 "&Grandezza caratteri di base:"
 
-#: /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 ""
 "Assistente per aiutare a scegliere la grandezza appropriata dei carateri"
 
-#: /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 "&Altezza delle righe:"
 
-#: /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 "&Encoding dei caratteri di input"
 
-#: /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 "Rimuovi gli spa&zi tra i paragrafi"
 
-#: /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 "Ampiezza dell'indentazione:"
 
-#: /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. "
@@ -3455,41 +3669,33 @@ msgstr ""
 "ai paragrafi indentazione per assicurarsi che i paragrafi siano facilmente "
 "distinguibili. Questa opzione controlla l'ampiezza dell'indentazione."
 
-#: /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 " em"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:139
-msgid "&Linearize tables"
-msgstr "&Linearizza le tabelle"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:140
-msgid "&Transliterate unicode characters to ASCII."
-msgstr "&Converti da caratteri unicode a ASCII."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:141
-msgid "Extra &CSS"
-msgstr "&CSS addizionale"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:142
-msgid "Insert &blank line"
-msgstr "Inserimento di righe &vuote"
-
-#: /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"
-msgstr "giustifica"
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
+msgid "&Linearize tables"
+msgstr "&Linearizza le tabelle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:145
-msgid "left"
-msgstr "sinistra"
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
+msgid "Extra &CSS"
+msgstr "&CSS addizionale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:146
-msgid "original"
-msgstr "originale"
+#: /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 "Inserimento di righe &vuote"
+
+#: /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"
@@ -3559,38 +3765,38 @@ msgstr ""
 "possibili."
 
 #: /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 "Seleziona copertina per "
 
 #: /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 "Impossibile leggere"
 
 #: /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 "Non si hanno i permessi per leggere il file: "
 
 #: /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 "Errore nella lettura del file"
 
 #: /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>Si è verificato un errore nella lettura del file: <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 " non è un'immagine valida"
 
 #: /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 "Copertina del libro"
 
@@ -3599,29 +3805,29 @@ msgid "Use cover from &source file"
 msgstr "Usa copertina del file di &origine"
 
 #: /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 "Ca&mbia l'immagine di copertina:"
 
 #: /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 ""
 "Sfoglia per trovare un'immagine da usare come copertina per questo libro"
 
 #: /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 "&Titolo: "
 
 #: /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 "Cambia il titolo di questo libro"
 
 #: /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&utore(i): "
 
@@ -3638,19 +3844,19 @@ msgstr ""
 "una virgola"
 
 #: /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 "&Editore: "
 
 #: /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 "T&ag: "
 
 #: /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."
@@ -3660,22 +3866,22 @@ msgstr ""
 "virgola"
 
 #: /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 "&Serie:"
 
 #: /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 "Lista di serie conosciute. È possibile aggiungere nuove serie"
 
 #: /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 "Libro "
 
@@ -3760,12 +3966,12 @@ msgid "PDB Input"
 msgstr "Input PDB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
 msgid "Treat each &line as a paragraph"
 msgstr "Considera ogni linea come un paragrafo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
 msgid "Assume print formatting"
 msgstr "Inferire il formato di stampa"
 
@@ -3793,34 +3999,38 @@ msgstr "Nesuna &images:"
 msgid "PDF Output"
 msgstr "Output PDF"
 
-#: /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 "Grandezza &paper:"
 
-#: /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 "&Orientazione:"
 
+#: /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 "Output RB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2067
+#: /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 "Scegliere il formato da leggere"
 
-#: /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 ""
 "Non é possibile creare una regex usando l'interfaccia del GUI builder senza "
 "un libro"
 
-#: /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 "Non sono disponibili formati"
 
-#: /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 "Libro aperto"
 
@@ -3989,11 +4199,11 @@ msgstr "Tavola dei contentuti (TOC) &Filter."
 msgid "TXT Input"
 msgstr "Input TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
 msgid "Process using markdown"
 msgstr "Analizzare utilizzando markdown"
 
-#: /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 "
@@ -4003,12 +4213,16 @@ msgstr ""
 "permette formattazione avanzata. Per maggiori informazioni andate su <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
+#: /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 ""
 "Non inserire la tabella dei contenuti nel testo di output quando si utilizza "
 "il markdown."
 
+#: /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 "Output TXT"
@@ -4116,208 +4330,265 @@ msgstr ""
 "Selezionare i formati disponibili e il loro ordine per questo dispositivo di "
 "lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:38
+#: /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/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 "Sì"
+
+#: /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 "No"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
 #: /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:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr "Il dispositivo di lettura non più collegato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr "Ottieni informazioni sul dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 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:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr "Ricevi annotazioni dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr "Invia metadati al dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr "Invia %d libri nel dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr "Cancella i libri dal dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr "Scarica libri dal dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr "Visualizza libro sul dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "ed elimina dalla biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 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: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: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
 msgid "Email to"
 msgstr "Invia messaggio elettronico a"
 
-#: /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:401
 msgid "Send to main memory"
 msgstr "Invia alla memoria principale"
 
-#: /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:403
 msgid "Send to storage card A"
 msgstr "Invia alla scheda di memoria 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:405
 msgid "Send to storage card B"
 msgstr "Invia alla scheda di memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-msgstr "Invia il formato specifico alla memoria principale"
+#: /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:362
-msgid "Send specific format to storage card A"
-msgstr "Invia il formato specifico alla scheda di memoria A"
+#: /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:364
-msgid "Send specific format to storage card B"
-msgstr "Invia il formato specifico alla scheda di memoria 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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr "Prendi annotazioni (sperimentale)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr "Selezione per l'invio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr "Nessun dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 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:534
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr "Nessuna scheda"
 
-#: /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:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "Libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr "Troverete allegato il libro elettronico"
 
-#: /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:668
+#: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr "nel formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr "Spedizione di un messaggio elettronico a"
 
-#: /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: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
 msgid "No suitable formats"
 msgstr "Nessun formato adatto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 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:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 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:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr "Non é stato possibile inviare dei libri via posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 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:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr "Inviato per posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr "Notizie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr "Allegato c'é"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr "Notizie inviate a"
 
-#: /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:812
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:872
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:991
 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:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr "Inviando i cataloghi al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr "Invio notizie al dispositivo di lettura in corso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr "Invio libri al dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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."
@@ -4326,11 +4597,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:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr "Spazio insufficiente sul dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4354,9 +4625,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.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:93
+#: /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 "Percorso"
 
@@ -4364,10 +4635,10 @@ msgstr "Percorso"
 #: /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
+#: /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 "Formati"
 
@@ -4419,12 +4690,12 @@ msgstr "Opzioni catalogo"
 msgid "Choose Format"
 msgstr "Scegliere il formato"
 
-#: /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 ""
 "Imposta i parametri predefiniti per la conversione di fumetti (file CBR/CBZ)"
 
-#: /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 "mposta le opzioni per convertire %s"
 
@@ -4440,15 +4711,19 @@ msgstr "&Autore(i)"
 msgid "&Profile:"
 msgstr "&Profilo:"
 
-#: /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 "%(plugin_type)s %(plugins)s"
 
-#: /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 "plugins"
 
-#: /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: "
@@ -4456,23 +4731,23 @@ msgstr ""
 "\n"
 "Personalizzazione: "
 
-#: /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 "Conversione"
 
-#: /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 "Generale"
 
-#: /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 "Interfaccia"
 
-#: /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 "Aggiungi/Salva"
 
-#: /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"
@@ -4480,11 +4755,11 @@ msgstr ""
 "Invio per \n"
 "email"
 
-#: /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 "Avanzate"
 
-#: /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"
@@ -4492,23 +4767,23 @@ msgstr ""
 "Server dei\n"
 "contenuti"
 
-#: /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 "Plug-in"
 
-#: /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 "Invio automatico"
 
-#: /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 "Posta elettronica"
 
-#: /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 "Formati per email. Verrá inviato il primo formato compatibile."
 
-#: /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)."
@@ -4517,148 +4792,175 @@ msgstr ""
 "questo indirizzo di posta elettronica (presupposto che ce ne sia uno "
 "indicato nella lista delle opzioni)."
 
-#: /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 "nuovo indirizzo di posta elettronica."
 
-#: /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 "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:490
 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/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 "Errore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 "Non é stato possibile installare gli strumenti per i comandi di linea."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Strumenti per i comandi di linea installati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr "Strumenti per i comandi di linea installati in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Se muovete calibre.app, sará necessario reinstallare anche gli strumenti per "
 "i comandi di linea."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "Percorso del plugin non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s non é un percorso di plugin valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Selezionare plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Il plugin non puó essere disattivato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "il plugin: %s non puó essere disattivato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Non é possibile personalizzare il plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin: %s non richiede personalizzazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Personalizzazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Non é possibile rimuovere un plugin incorporato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " Non é possibile rimuoverlo. Questo é un plugin incorporato. Provate invece "
 "a disattivarlo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr "Si è sicuri?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
+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:745
 msgid "Error log:"
 msgstr "File di log degli errori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "File di log degli accessi:"
 
-#: /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:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "Avvio del server dei contenuti fallito"
 
-#: /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:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Selezionare un percorso per i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Dimensione non valida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "La dimensione %s non è valida. Deve essere nella forma larghezzaxaltezza"
 
-#: /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:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "Percorso database non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "Percorso database non valido "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Deve essere una cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Percorso database non valido.<br>Impossibile scrivere su "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr "Controllo dell'integritá del database."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "Controllo dell'integritá del database fallito."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "Sono stati trovati problemi di consistenza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4795,13 +5097,13 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Invio al &dispositivo"
 
-#: /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:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: /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:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -4809,28 +5111,28 @@ msgstr ""
 "Per&corso dei libri (I libri sono salvati in cartelle salvate per autore e i "
 "metadati sono salvati nel file 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:529
 msgid "Browse for the new database location"
 msgstr "Sfoglia per specificare una nuova posizione del database"
 
-#: /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:531
 msgid "Show notification when &new version is available"
 msgstr "&Visualizza un avvertimento quando è disponibile una nuova versione"
 
-#: /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:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "Scarica i metadati &sociali (etichette, valutazioni, etc.) automaticamente"
 
-#: /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:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Sovrascrivi autore e titolo quando si scaricano i metadata"
 
-#: /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:534
 msgid "Default network &timeout:"
 msgstr "&Timeout predefinito della rete:"
 
-#: /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:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -4838,125 +5140,141 @@ msgstr ""
 "Imposta il timeout predefinito per gli scaricamenti dalla rete (cioè ogni "
 "volta che si usa Internet per prelevare informazioni)"
 
-#: /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:536
 msgid " seconds"
 msgstr " secondi"
 
-#: /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:537
 msgid "Choose &language (requires restart):"
 msgstr "Ling&ua (richiede il riavvio):"
 
-#: /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:538
 msgid "Normal"
 msgstr "Normale"
 
-#: /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:539
 msgid "High"
 msgstr "Massima"
 
-#: /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:540
 msgid "Low"
 msgstr "Minima"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr "&Priorità dei lavori:"
 
-#: /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:542
 msgid "Preferred &output format:"
 msgstr "Formato preferito per l'&output:"
 
-#: /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:543
 msgid "Preferred &input format order:"
 msgstr "Ordine dei formati preferiti per l'&input:"
 
-#: /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:546
 msgid "Use &Roman numerals for series number"
 msgstr "&Usa numeri romani per i numeri di serie"
 
-#: /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:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Abilita l'icona nel vassoio di sistema (richiede il riavvio)"
 
-#: /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:548
 msgid "Show &notifications in system tray"
 msgstr "Visualizza le &notifiche nella barra di sistema."
 
-#: /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:549
+msgid "Show &splash screen at startup"
+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 ""
 "Visualizza il &browser di copertine in una finestra separata (richiede il "
 "riavvio)"
 
-#: /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:551
 msgid "Search as you type"
 msgstr "Cerca mentre si scrive"
 
-#: /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:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Invia automaticamente le noti&zie scaricate al lettore di libri"
 
-#: /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:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Rimuovi le notizie dalla libreria dopo averle inviate automaticamente al "
 "dispositivo di lettura."
 
-#: /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:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Number di copertine da visualizzare in modalitá sfoglia (richiede rilancio "
 "del programma):"
 
-#: /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:555
 msgid "Toolbar"
 msgstr "Barra degli strumenti"
 
-#: /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:556
 msgid "Large"
 msgstr "Grande"
 
-#: /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:557
 msgid "Medium"
 msgstr "Media"
 
-#: /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:558
 msgid "Small"
 msgstr "Piccola"
 
-#: /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:559
 msgid "&Button size in toolbar"
 msgstr "&Dimensione bottoni nella barra degli strumenti"
 
-#: /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:560
 msgid "Show &text in toolbar buttons"
 msgstr "&Mostra testo nei bottoni della barra degli strumenti"
 
-#: /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:561
 msgid "Select visible &columns in library view"
 msgstr "&Selezionare le colonne visibili nella vista biblioteca"
 
-#: /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:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Utilizza il &visualizzatore interno per:"
 
-#: /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:571
 msgid "Add an email address to which to send books"
 msgstr "Aggiungi un indirizzo di posta elettronica a cui inviare i libri"
 
-#: /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:572
 msgid "&Add email"
 msgstr "&Aggiungi email"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Crea &default"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "&Elimina email"
 
-#: /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:575
 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-"
@@ -4966,35 +5284,35 @@ msgstr ""
 "email saranno automaticamente inviate per ogni notizia scaricata a tutti gli "
 "indirizzi email a cui hai abilitato l'invio automatico"
 
-#: /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:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "Numero &massimo di elaboratori di processi in attesa (richiede rilancio del "
 "programma):"
 
-#: /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:577
 msgid "&Check database integrity"
 msgstr "&Controllo dell'integritá del database"
 
-#: /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:578
 msgid "&Install command line tools"
 msgstr "&Installa gli strumenti per i comandi di linea"
 
-#: /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:579
 msgid "Open calibre &configuration directory"
 msgstr "Apri la cartella per la &configurazione di Calibre"
 
-#: /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:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Limita il massimo numero di job simultanei al numero dei &processori "
 "disponibili"
 
-#: /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:581
 msgid "Debug &device detection"
 msgstr "&Debug e riconoscimento dei dispositivi"
 
-#: /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:582
 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 "
@@ -5004,25 +5322,25 @@ msgstr ""
 "libri usando un browser in qualunque parte del mondo. Qualsiasi cambiamento "
 "nella configurazione verrà attivato solo dopo il riavvio del server."
 
-#: /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:583
 msgid "Server &port:"
 msgstr "&Porta del server:"
 
-#: /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:584
 #: /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 utente:"
 
-#: /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:585
 #: /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 "&Password:"
 
-#: /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:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5030,7 +5348,7 @@ msgstr ""
 "Se si lascia la password in bianco, chiunque potrà accedere alla propria "
 "collezione di libri utilizzando l'interfaccia web."
 
-#: /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:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5038,41 +5356,41 @@ msgstr ""
 "La dimensione massima (larghezzaxaltezza) per le copertine visualizzate. Le "
 "copertine più larghe vengono ridimensionate. "
 
-#: /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:588
 msgid "Max. &cover size:"
 msgstr "Dimensi&one massima copertina:"
 
-#: /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:589
 #: /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 "&Mostra password"
 
-#: /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:590
 msgid "Max. &OPDS items per query:"
 msgstr "Massimo elementi &OPDS per richiesta:"
 
-#: /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:591
 msgid "&Start Server"
 msgstr "A&vvia il server"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "&Ferma il server"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "&Test sul server"
 
-#: /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:594
 msgid "Run server &automatically on startup"
 msgstr "Avvia a&utomaticamente il server all'apertura"
 
-#: /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:595
 msgid "View &server logs"
 msgstr "Visualizza i file di l&og del server"
 
-#: /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:596
 #: /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 "
@@ -5089,7 +5407,7 @@ msgstr ""
 "un nuovo catalogo sul tuo iPhone. In questo caso myhostname é da intendersi "
 "come il valore IP appropriato del computer su cui Calibre é attivo."
 
-#: /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:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5097,27 +5415,27 @@ msgstr ""
 "Qui è possibile personalizzare le funzioni di Calibre modificando quali "
 "plugin sono usati dal programma."
 
-#: /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:599
 msgid "Enable/&Disable plugin"
 msgstr "Attivare/&Disattiva il plugin"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "&Configura il plugin"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "&Rimuovi il plugin"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Aggiungi un nuovo plugin"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "Plugin &file:"
 
-#: /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:605
 msgid "&Add"
 msgstr "&Aggiungi"
 
@@ -5145,16 +5463,6 @@ msgstr ""
 msgid "Values can be edited"
 msgstr "I valori possono essere modificati"
 
-#: /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 "Sì"
-
-#: /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 "No"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
@@ -5164,8 +5472,10 @@ 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: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
 msgid "Date"
 msgstr "Data"
 
@@ -5181,6 +5491,127 @@ msgstr ""
 msgid "Create and edit tag-based columns"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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 "Ottieni le informazioni di debug"
@@ -5227,10 +5658,6 @@ msgstr "Variabili disponibili:"
 msgid "Downloading social metadata, please wait..."
 msgstr "Scaricamento dei metadati sociali, per favore attendere..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "Si è sicuri?"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr "&Show ancora questa avvertenza"
@@ -5345,29 +5772,24 @@ msgstr "Visualizza i &details del processo in corso"
 msgid "Stop &all jobs"
 msgstr "Ferma &all i processi in corso"
 
-#: /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 "Modifica metadati"
 
-#: /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 "Metadati"
-
-#: /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 "Imposta a&utomaticamente la Classificazione autore"
 
-#: /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 "Author s&ort: "
 
-#: /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."
@@ -5375,55 +5797,55 @@ msgstr ""
 "Specifica come deve essere classificato l'autore di questo libro. Ad "
 "esempio, Charles Dickens deve essere classificato come Dickens, Charles."
 
-#: /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 "&Giudizio:"
 
-#: /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 "Giudizio su questo libro. 0-5 stelle"
 
-#: /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 "Nessuna modifica"
 
-#: /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 " stelle"
 
-#: /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 "Aggiungi ta&gs: "
 
-#: /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 "Apri l'editor dei tag"
 
-#: /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 "&Rimuovi tag:"
 
-#: /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 "Lista separata da virgole dei tag da rimuovere dal libro "
 
-#: /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 "Cancella for&mato:"
 
-#: /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 "&Swap titolo per autore"
 
-#: /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"
@@ -5431,201 +5853,226 @@ 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 "L'immagine non ee valida"
 
-#: /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 "Selezionare formati per: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1284
+#: /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 "Libri"
 
-#: /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 "Non ci sono privilegi"
 
-#: /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 "Non hai privilegi per leggere i documenti indicati:"
 
-#: /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 "Nessun formato selezionato"
 
-#: /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 "Non é possibile leggere i metadati"
 
-#: /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 "Non é possibile leggere i metadati dai formati %s"
 
-#: /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 "Non é possibile visualizzare la copertina"
 
-#: /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 "Non é possibile visualizzare la copertina dai formati %s"
 
-#: /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 "La copertina nel formato %s é invalida."
 
-#: /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 "Interrompere la modifica di tutti i libri rimanenti"
 
-#: /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:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr "Questo  numero ISBN è valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr "Questo  numero ISBN è valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr "Scaricamento della copertina..."
 
-#: /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: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
 msgid "Cannot fetch cover"
 msgstr "Impossibile scaricare la copertina"
 
-#: /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:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 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:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 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:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 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:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "Copertina inutilizzabile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr "Si sono verificati errori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 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:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr "Non é possibile scaricare i metadati."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 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:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 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."
 
-#: /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 "Modifica metadati"
 
-#: /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 "Metadati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
 msgstr "Scambia titolo e autore"
 
-#: /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 "&Classificazione autore: "
 
-#: /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 ""
 "Crea automaticamente la voce Classificazione autore basandosi sul contenuto "
 "del campo Autore."
 
-#: /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 "Rimuovi le serie inutilizzate (che non hanno libri)"
 
-#: /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 "Pubblicato&d:"
 
-#: /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 "gg MMM aaaa"
 
-#: /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 "&data"
 
-#: /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 "&Commenti"
 
-#: /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 "&Fetch i metadati dal server"
 
-#: /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 "Formati disponibili"
 
-#: /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 "Aggiungi un nuovo formato al database per questo libro"
 
-#: /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 "Cancella il formato selezionato dal database per questo libro"
 
-#: /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 "Specifica la copertina del libro dal formato selezionato"
 
-#: /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 "Aggiorna i metadati dai metadati del formato selezionato"
 
-#: /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 "Ripristinare la copertina predefinita"
 
-#: /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 "Scaricamento &cover"
 
@@ -5637,50 +6084,83 @@ msgstr "Password necessaria"
 msgid "Aborting..."
 msgstr "Interruzione..."
 
-#: /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 "É necessario usare un utente e password"
 
-#: /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 ""
 "É necessario usare un nome utente e/o una password per questa sito di "
 "notizie."
 
-#: /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 "Creato da: "
 
-#: /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 "Ultimo scaricamento: mai"
 
-#: /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 "%d giorni, %d ore e %d minuti trascorsi"
 
-#: /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 "Ultimo scaricamento"
 
-#: /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 "Programmare lo scaricamento delle notizie"
 
-#: /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 "Aggiungi una fonte di notizie personalizzata"
 
-#: /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 "Nessuna connessione internet"
 
-#: /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 "Impossibile scaricare le notizie perchè la connessione non è attiva"
 
@@ -5885,11 +6365,79 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Seleziona i formati"
 
-#: /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:72
+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
+msgid "Publishers"
+msgstr "Editori"
+
+#: /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 "Siete sicuri?"
 
-#: /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?"
@@ -5941,6 +6489,66 @@ msgstr ""
 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:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "Prova la configurazione della posta elettronica"
@@ -6254,86 +6862,172 @@ msgstr "ISBN:"
 msgid "Regular expression (?P<isbn>)"
 msgstr "Espressione regolare (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr "Lavoro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "Stato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "Progresso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr "Tempo di esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr "Ci sono %d processi in corso:"
 
-#: /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:73
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:95
 msgid "Unknown job"
 msgstr "Lavoro sconosciuto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr "Ci sono %d processi in attesa:"
 
-#: /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:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr "Impossibile terminare il lavoro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 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:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr "Il lavoro è già stato avviato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr "Non disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr " - Lavori"
 
-#: /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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "Giudizio"
 
-#: /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/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:440
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
 msgid "None"
 msgstr "Nessuno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 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.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr "Formato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+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
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Non permesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6341,14 +7035,6 @@ msgstr ""
 "Copiare direttamente sul dispositivo di lettura non é supportato. Prima é "
 "necessario aggiungere il libro nella libreria di Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "Formato"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1151
-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/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr "Configura visualizzatore"
@@ -6423,132 +7109,153 @@ msgstr "Apri libro"
 msgid "Configure"
 msgstr "Configurazione"
 
-#: /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 "Usa la biblioteca collocata nel percorso specificato."
 
-#: /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 "Incominciare minimizato nella barra di sistema"
 
-#: /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 "Invia le informazioni di debug alla console"
 
-#: /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 "Non controllare gli aggiornamenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
+#: /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:74
+#: /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:75
+#: /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:145
+#: /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:146
+#: /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:150
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:594
+#: /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 "Libreria di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 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:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Percorso del database sbagliato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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:206
 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:219
 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:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "Non e' possibile incominciare "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s é giá in funzione."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 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:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 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:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "Provate a far ripartire il computer."
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "provate a rimuovere il documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 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:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr "posta in ui,py"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "Ricerca avanzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "&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:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -6556,142 +7263,146 @@ 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:372
-msgid "set in ui.py"
-msgstr "posta in ui,py"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr "Resetta ricerca veloce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 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:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 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:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 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:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "Ordina per p&opolarità"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr "Fai corrispondere uno qualsiasi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr "Fai corrispondere tutti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "Aggiungi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 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:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "Cancella libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Canc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 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:424
+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:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "Invia al dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
+#: /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 "Salva su disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "Scarica notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "Converti libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Leggi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "Apri la cartella contenente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "Visualizza i dettagli del libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "Libri dello stesso autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "Libri in questa serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr "Libri di questo editore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "Libri con lo stesso tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr "Configurazione di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -6723,11 +7434,15 @@ 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:78
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "Cerca"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Premi un tasto..."
@@ -6788,46 +7503,84 @@ msgstr "Svuota"
 msgid "&Alternate shortcut:"
 msgstr "Scorciatoia &alternativa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr "Lavori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:163
+#: /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/status.py:201
-msgid "Click to browse books by their covers"
-msgstr "Fare clic per sfogliare i libri per copertine"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr "Fare clic per disattivare la navigazione per copertina"
-
-#: /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/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
-"<p>La navigazione per copertina è disabilitata.<br>Caricamento del modulo "
-"pictureflow fallito:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
-msgstr "Fare clic per sfogliare i libri per tag"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "Autori"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Hide Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "Editori"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Ricerche"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -6871,85 +7624,85 @@ msgstr ""
 "I libri nella lista sono giá stati convertiti nel formato %s. Volete "
 "convertirli nuovamente?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:67
+#: /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:148
+#: /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:154
+#: /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:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Ripristina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "&donate per supportare Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Riavvia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:273
+#: /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:275
+#: /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:277
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:284
+#: /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:286
+#: /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:293
+#: /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:294
+#: /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)"
@@ -6958,7 +7711,7 @@ msgstr ""
 "cartella, si assume che ogni documento di libro elettronico é lo stesso "
 "libro in formati differenti)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:297
+#: /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)"
@@ -6966,93 +7719,105 @@ 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:300
+#: /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:348
+#: /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:349
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2172
+#: /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 "Salva sul disco solo il formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /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:363
+#: /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:365
+#: /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:367
+#: /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:369
+#: /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:406
+#: /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:407
+#: /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:410
+#: /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:426
+#: /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:462
+#: /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:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Guida rapida di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Sfoglia per copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "(tutti i libri)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
-msgstr "(%d trovato)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Dispositivo di lettura: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Connesso "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "Database del dispositivo di lettura corrotto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7081,148 +7846,148 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1180
+#: /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 "Usare solo la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1181
+#: /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 "Annotazioni utente generate solo dalla biblioteca principale"
 
-#: /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
+#: /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 "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 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:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr "Fondi le annotazioni utente nel database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 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:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 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:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 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:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 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:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 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:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "Quanti libri vuoti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr "quanti libri vuoti si desidera aggiungere?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1324
+#: /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 "Invio libri al dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "Libri EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "Libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "Libri HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "Libri LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "Libri MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr "Libri Topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Libri TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "Libri PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Archivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "Libri supportati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "Uniti alcuni libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 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:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Non é stato possibile leggere i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 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:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "Non si può cancellare"
 
-#: /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
+#: /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 "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "Seleziona i formati da cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 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:1433
+#: /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?"
@@ -7230,57 +7995,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:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Cancellamento libri dal dispositivo di lettura."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Non é possibile scaricare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "metadati sociali"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Scaricamento %s per %d libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Non si é riusciti a scaricare alcuni metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 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:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Lo scaricamento dei metadati é fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1586
+#: /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 "Impossibile modificare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -7288,7 +8059,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -7298,46 +8069,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:1638
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Impossibile salvare sul disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Scegliere la cartella di destinazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Errore durante il salvataggio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "Si é verificato un errore durante il salvataggio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1778
+#: /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 "Non é stato possibile salvare tutti i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 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:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 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:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "Generando %s catalogo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -7345,48 +8116,44 @@ msgstr ""
 "Nessun libro da catalogare\n"
 "Controlla i tag esclusi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "Catalogo generato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "Esporta il catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "Selezionare una destinazione per %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Scaricamento notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " preso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr "Conversione di %d libro/libri incominciata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "Impossibile leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr "Impossibile aprire la cartella"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Piú di un libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -7398,33 +8165,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:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr "Impossibile aprire la cartella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s non ha formati disponibili"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo di lettura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2258
+#: /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."
@@ -7432,12 +8212,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:2281
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -7446,15 +8226,15 @@ msgstr ""
 "href=\"%s\">DRM</a>. É necessario rimuovere la DRM usando un prodotto da "
 "terzi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Ricetta deattivata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Operazione Fallita</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -7462,11 +8242,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:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7477,11 +8257,11 @@ msgstr ""
 "sul dispositivo di lettura.<br>\n"
 "                      Siete sicuri di voler interrompere il processo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -7489,7 +8269,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:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -7497,11 +8277,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:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Aggiornamento disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -8037,49 +8817,53 @@ msgstr ""
 "%s\n"
 "disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 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:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 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:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 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:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr "Modificare capitalizzazioned dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr "Maiuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr "Minuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr "Inverti capitalizzazione dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr "Caratteri per titolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:366
+#: /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 "
@@ -8090,7 +8874,7 @@ msgstr ""
 "dal vostro dispositivo di lettura. Per fare questo é necessario attivare il "
 "server di contenuti."
 
-#: /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."
@@ -8098,7 +8882,7 @@ msgstr ""
 "Ricordate di lasciare Calibre aperto poiché il server funziona solamente "
 "quando Calibre é aperto."
 
-#: /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 "
@@ -8108,20 +8892,20 @@ msgstr ""
 "di Calibre per WordPlayer. n uesto caso myhostname é da intendersi come il "
 "valore IP appropriato del computer su cui Calibre é attivo."
 
-#: /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 "Spostamento della libreria in corso..."
 
-#: /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 "Non ´stato possibile muovere la libreria"
 
-#: /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 "Database non valido"
 
-#: /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"
@@ -8129,11 +8913,11 @@ msgstr ""
 "<p>Una libreria non valida esiste giá in %s, Cancellate il documento prima "
 "di tentare di muovere la libreria esistente. <br> Errore: %s"
 
-#: /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 "Non é possibile spostare la libreria"
 
-#: /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 "Benvenuti nel wizard"
 
@@ -8172,13 +8956,6 @@ msgstr "&Marche"
 msgid "&Devices"
 msgstr "&Dispositivi"
 
-#: /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 "Pagina dell'assistente"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:48
 msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
@@ -8399,46 +9176,50 @@ msgstr ""
 msgid "Turn on the &content server"
 msgstr "Attivare in server di &content"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
-msgstr "Impostazioni per controllare il server dei contenuti di calibre"
-
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
-msgstr "La porta in cui ascoltare. Predefinita: %default"
-
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
-msgstr "Il timeout del server in secondi. Predefinito: %default"
-
-#: /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:256
+msgid "today"
 msgstr ""
-"Il numero massimo di istanze di lavoro da usare. Predefinito: %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:259
+msgid "yesterday"
 msgstr ""
-"Imposta una password per restringere l'accesso. Come impostazione "
-"predefinita l'accesso non è ristretto."
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
-msgstr "Nome utente per l'accesso. Predefinito: %default"
-
-#: /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:262
+msgid "thismonth"
 msgstr ""
-"La dimensione massima per le copertine visualizzate. Il valore predefinito é "
-"%default."
 
-#: /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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "empty"
 msgstr ""
-"Il valore massimo di risultati da presentare per una richiesta OPDS. Questo "
-"ha effetto sull'integrazione con Stanza, WordPlayer, etc."
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
 msgid ""
@@ -8466,7 +9247,7 @@ msgstr ""
 "Campi di default: '%default'\n"
 "Si applica a: CSV, XML formati di output"
 
-#: /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"
@@ -8476,7 +9257,7 @@ msgstr ""
 "Valore predefinito: '%default'\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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 "
@@ -8490,7 +9271,7 @@ msgstr ""
 "Valore predefinito: '%default' Nessuno\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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"
@@ -8501,7 +9282,7 @@ msgstr ""
 "'[<tag>]'\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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"
@@ -8516,7 +9297,7 @@ msgstr ""
 "Valore predefinito: '%default'\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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"
@@ -8526,7 +9307,7 @@ msgstr ""
 "Default: '%default'\n"
 "Applica a: formati di output epub, MOBI"
 
-#: /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"
@@ -8536,7 +9317,7 @@ msgstr ""
 "Default: '%default'\n"
 "Applica a: formati di output epub, MOBI"
 
-#: /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"
@@ -8547,7 +9328,7 @@ msgstr ""
 "Valore predefinito: '%default'\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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"
@@ -8561,7 +9342,7 @@ msgstr ""
 "Valore predefinito: '%default'\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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 "
@@ -8577,7 +9358,7 @@ msgstr ""
 "Valore predefinito: '%default'\n"
 "Applicabile ai formati di output: ePub, MOBI"
 
-#: /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"
@@ -8587,7 +9368,7 @@ msgstr ""
 "Valore predefinito: '%default'\n"
 "Applicabile per i formati di output: ePub, MOBI"
 
-#: /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."
@@ -8595,7 +9376,7 @@ msgstr ""
 "Percorso alla biblioteca di calibre. L'impostazione predefinita è quella di "
 "usare il percorso salvato nelle impostazioni."
 
-#: /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"
@@ -8605,7 +9386,7 @@ msgstr ""
 "\n"
 "Elenca i libri disponibili nel database di calibre.\n"
 
-#: /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"
@@ -8620,7 +9401,7 @@ msgstr ""
 "selezionare tutti i campi. Ha effetto solamente nel formato in uscita del "
 "testo."
 
-#: /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"
@@ -8630,11 +9411,11 @@ msgstr ""
 "Campi disponibili: %s\n"
 "Predefinito: %%default"
 
-#: /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 "Ordina i risultati in ordine crescente"
 
-#: /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 "
@@ -8644,7 +9425,7 @@ msgstr ""
 "documentazione relativa alla ricerca nel Manuale Utente. L'opzione "
 "predefinita è quella di non filtrare."
 
-#: /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."
@@ -8652,11 +9433,11 @@ msgstr ""
 "La larghezza massima di una singola linea nell'output. L'impostazione "
 "predefinita è quella di rilevare la dimensione dello schermo."
 
-#: /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 "La stringa usata per separare i campi. Predefinita: spazio."
 
-#: /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."
@@ -8664,23 +9445,15 @@ msgstr ""
 "Il prefisso per tutti i percorsi. L'impostazione predefinita è il percorso "
 "alla cartella della biblioteca."
 
-#: /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 ""
-"Il formato in cui fornire i dati. Scelte disponibili: %s. Il formato "
-"predefinito è: testo."
-
-#: /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 "Campi non validi. Campi disponibili:"
 
-#: /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 "Campo per l'ordinamento non valido. Campi disponibili:"
 
-#: /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):"
@@ -8688,7 +9461,7 @@ msgstr ""
 "I seguenti libri non sono stati aggiunti perché già esistenti nel database "
 "(vedere l'opzione --duplicates):"
 
-#: /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"
@@ -8702,7 +9475,7 @@ msgstr ""
 "specificare cartelle, vedere\n"
 "la cartella sottostante relativa alle opzioni.\n"
 
-#: /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"
@@ -8710,37 +9483,37 @@ msgstr ""
 "Assume che ogni cartella abbia un solo libro logico e che tutti i file "
 "presenti siano diversi formati per quel libro"
 
-#: /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 "Processa cartelle ricorsivamente"
 
-#: /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 "Aggiunge libri al database anche se esistono già."
 
-#: /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 "È necessario specificare almeno un file da aggiungere"
 
-#: /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"
@@ -8754,11 +9527,11 @@ msgstr ""
 "separata da virgole di numeri id (è possibile ottenere i numeri id usando il "
 "comando list). Ad esempio: 23,34,57-85\n"
 
-#: /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 "È necessario specificare almeno un libro da aggiungere"
 
-#: /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"
@@ -8772,15 +9545,15 @@ msgstr ""
 "identificato da id. È possibile ottenere gli id usando il comando list. Se "
 "il formato esiste già, verrà sovrascritto.\n"
 
-#: /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 "È necessario specificare un id e un file ebook"
 
-#: /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 "I file ebook devono avere un'estensione"
 
-#: /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"
@@ -8797,11 +9570,11 @@ msgstr ""
 "file come LRF, TXT o EPUB. Se il libro logico non ha un fmt disponibile, non "
 "fa niente.\n"
 
-#: /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 "È necessario specificare un id e un formato"
 
-#: /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"
@@ -8817,15 +9590,15 @@ msgstr ""
 "con id.\n"
 "id è un numero dalla lista dei comandi.\n"
 
-#: /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 "Stampa i metafati in formato OPF (XML)"
 
-#: /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 "È necessario specificare un id"
 
-#: /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"
@@ -8847,11 +9620,11 @@ msgstr ""
 "nel\n"
 "comando show_metadata.\n"
 
-#: /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 "È necessario specificare un id e un file di metadati"
 
-#: /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"
@@ -8869,27 +9642,27 @@ msgstr ""
 "(in un file opf). È possibile prendere i numeri di id dalla lista dei "
 "comandi.\n"
 
-#: /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 "Esporta tutti i libri del database, ignorando la lista di id."
 
-#: /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 "Esporta i libri nella cartella specificata. Predefinita:"
 
-#: /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 "Esporta tutti i libri nella stessa cartella"
 
-#: /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 "Selezionando questa opzioni renderá la funzione disabilitata."
 
-#: /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 "È necessario specificare qualche id o l'opzione %s"
 
-#: /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"
@@ -8900,23 +9673,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"
@@ -8935,7 +9708,7 @@ msgstr ""
 "catalogo generato per l'esportazione.\n"
 "    "
 
-#: /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"
@@ -8945,7 +9718,7 @@ msgstr ""
 "Se dichiarati, --search ricerca é ignorata\n"
 "Valore predefinito: tutti"
 
-#: /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"
@@ -8956,16 +9729,16 @@ msgstr ""
 "nel Manuale Utente.\n"
 "Default: nessun filtraggio"
 
-#: /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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Mostra un output dettagliato. Utile per il debugging"
 
-#: /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 "Errore: devi specificate un file di output del catalogo"
 
-#: /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"
@@ -8977,17 +9750,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"
@@ -8996,19 +9769,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"
@@ -9018,15 +9791,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"
@@ -9046,31 +9819,47 @@ msgstr ""
 "\n"
 "Per aiuto su un comando particolare: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 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:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Sto copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Compattazione database"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Controllo di integrita' SQL..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Controllo per file mancanti"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "ID controllate"
 
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr "Il titolo"
@@ -9217,12 +10006,53 @@ msgstr "Sostituire gli spazi vuoti con sottolineature."
 msgid "Requested formats not available"
 msgstr "I formati richiesti non sono disponibili."
 
-#: /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 "Impostazioni per controllare il server dei contenuti di calibre"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr "La porta in cui ascoltare. Predefinita: %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr "Il timeout del server in secondi. Predefinito: %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 ""
+"Il numero massimo di istanze di lavoro da usare. Predefinito: %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 ""
+"Imposta una password per restringere l'accesso. Come impostazione "
+"predefinita l'accesso non è ristretto."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
+msgid "Username for access. By default, it is: %default"
+msgstr "Nome utente per l'accesso. Predefinito: %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+"La dimensione massima per le copertine visualizzate. Il valore predefinito é "
+"%default."
+
+#: /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 ""
+"Il valore massimo di risultati da presentare per una richiesta OPDS. Questo "
+"ha effetto sull'integrazione con Stanza, WordPlayer, etc."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 "Password per accedere alla propria biblioteca di calibre. Il nome utente è "
 
-#: /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"
@@ -9232,16 +10062,56 @@ msgstr ""
 "\n"
 "Avvia il server dei contenuti di calibre."
 
-#: /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 ""
 "Percorso per la cartella da cui la libreria e' disponibile per il server di "
 "contenuti"
 
-#: /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 "Scrivere PID per il file specificato"
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr "%sUso%s: %s\n"
@@ -9258,58 +10128,62 @@ msgstr ""
 "Ogni qualvolta si voglia passare un argomento al comando %prog  che ha degli "
 "spazi vuoti, é necessario mettere l'argomento fra virgolette."
 
-#: /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 "Percorso del database in cui sono salvati i libri"
 
-#: /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 "Modelli per indovinare i metadati dai nomi dei file"
 
-#: /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 "Chiave di accesso per isbndb.com"
 
-#: /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 "Timeout predefinito per le operazioni di rete (secondi)"
 
-#: /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 "Percorso alla cartella in cui è salvata la biblioteca"
 
-#: /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 "La lingua in cui visualizzare l'interfaccia utente"
 
-#: /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 "Il formato predefinito per la conversione dei libri."
 
-#: /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 "Lista ordinata di preferenze peri formati di input"
 
-#: /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 "Leggi metadati dai file"
 
-#: /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 "La priorità dei processi di lavoro"
 
-#: /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 "Inverti  nome e Cognome dell'autore durante la lettura dei metadata"
 
-#: /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 "Aggiungere nuovi formati ai libri esistenti"
 
-#: /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 "Elenco delle ricerche salvate"
 
+#: /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 "In attesa..."
@@ -9391,18 +10265,22 @@ msgid "English (Ireland)"
 msgstr "English (Ireland)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "Spanish (Paraguay)"
+msgid "English (China)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
+msgid "Spanish (Paraguay)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr "Tedesco (AT)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr "Olandese (Olanda)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr "Olandese (Belgio)"
 
@@ -9426,13 +10304,13 @@ msgstr "Autenticazione fallita col server: %s"
 msgid "Control email delivery"
 msgstr "Controllo dell'invio delle email"
 
-#: /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:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr "Feed sconosciuto"
 
-#: /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:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "Articolo senza titolo"
 
@@ -9471,89 +10349,89 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Sorgente di notizie sconosciuta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Scaricamento completato"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " da "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tLink falliti:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Scaricamento feed..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "Ricevuti feed dalla pagina principale"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Tentativo di scaricamento della copertina..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Preparazione dell'immagine principale in corso"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Inizio scaricamento [%d articolo(i)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Feed scaricati in %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Impossibile scaricare la copertina: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Scaricamento copertina da %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "Immagine principale scaricata"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Articolo senza titolo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1228
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Articolo scaricato: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1239
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Scaricamento fallito dell'articolo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1256
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Scaricamento feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1403
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -9561,7 +10439,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:1419
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -9584,7 +10462,7 @@ msgstr "Pianificato"
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9594,11 +10472,11 @@ msgstr ""
 "\n"
 "Dov'è l'URL. Esempio: http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Cartella base in cui le URL sono salvate. Predefinita: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -9606,7 +10484,7 @@ msgstr ""
 "Timeout in secondi da aspettare per una risposta dal server. Predefinito: "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -9614,7 +10492,7 @@ msgstr ""
 "Numero massimo di livelli ricorsivi, cioè profondità dei link da seguire. "
 "Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -9622,7 +10500,7 @@ msgstr ""
 "Il numero massimo di file da scaricare. Questa si applica solo ai file dai "
 "tag <a fref>. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -9630,7 +10508,7 @@ msgstr ""
 "Intervallo minimo in secondi tra due scaricamenti consecutivi. Predefinito: "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -9638,7 +10516,7 @@ msgstr ""
 "La codifica caratteri del sito web che si sta cercando di scaricare. "
 "L'impostazione predefinita è quella di provare a indovinare la codifica"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -9649,7 +10527,7 @@ msgstr ""
 "un link corrisponde a una delle espressioni regolari verrà seguito. Per "
 "impostazione predefinita i link non vengono seguiti"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -9664,7 +10542,7 @@ msgstr ""
 "sia --filter-regexp che --match-regexp, --filter-regexp viene applicata per "
 "prima"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Non scaricare i fogli di stile CSS"
 
@@ -10364,12 +11242,25 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "Fare clic per vedere la lista di libri nella memoria principale del proprio "
 #~ "lettore"
 
+#~ msgid "Click to turn off Cover Browsing"
+#~ msgstr "Fare clic per disattivare la navigazione per copertina"
+
+#~ msgid "Click to browse books by their covers"
+#~ msgstr "Fare clic per sfogliare i libri per copertine"
+
 #~ msgid ""
 #~ " is an image based PDF. Only conversion of text based PDFs is supported."
 #~ msgstr ""
 #~ " è un PDF basato su immagini. È supportata solamente la conversione di PDF "
 #~ "basati su testo."
 
+#~ msgid ""
+#~ "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+#~ "module failed:<br>"
+#~ msgstr ""
+#~ "<p>La navigazione per copertina è disabilitata.<br>Caricamento del modulo "
+#~ "pictureflow fallito:<br>"
+
 #~ msgid "Don't add &links to the table of contents"
 #~ msgstr "Non aggiungere li&nk al sommario"
 
@@ -10737,6 +11628,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Copying database"
 #~ msgstr "Sto copiando il database"
 
+#~ msgid "Click to browse books by tags"
+#~ msgstr "Fare clic per sfogliare i libri per tag"
+
 #~ msgid "<p>Copying books to %s<br><center>"
 #~ msgstr "<p>Sto copiando i libri in %s<br><center>"
 
@@ -10968,6 +11862,13 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Regular expression (?P<authors>)"
 #~ msgstr "Espressione regolare (?P<authors>)"
 
+#~ msgid ""
+#~ "The format in which to output the data. Available choices: %s. Defaults is "
+#~ "text."
+#~ msgstr ""
+#~ "Il formato in cui fornire i dati. Scelte disponibili: %s. Il formato "
+#~ "predefinito è: testo."
+
 #~ msgid ""
 #~ "See the <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
 #~ "search-interface\">User Manual</a> for more help"
@@ -11047,6 +11948,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "%s\n"
 #~ "disponibile"
 
+#~ msgid "and delete from library"
+#~ msgstr "ed elimina dalla biblioteca"
+
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Scegliere un percorso per la propria biblioteca."
 
@@ -11159,6 +12063,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "il testo giustificato dipende dalla capacità del formato ebook e del "
 #~ "dispositivo di lettura di supportare tale caratteristica"
 
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "Comunicazione in corso con il Sony PRS-300/505/500."
+
 #~ msgid "Options to control e-book conversion."
 #~ msgstr "Opzioni per controllare la conversione del libro digitale."
 
@@ -11192,6 +12099,15 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Add a tab at the beginning of each paragraph"
 #~ msgstr "Aggiunge un TAB all'inizio di ogni paragrafo"
 
+#~ msgid "Send specific format to main memory"
+#~ msgstr "Invia il formato specifico alla memoria principale"
+
+#~ msgid "Send specific format to storage card A"
+#~ msgstr "Invia il formato specifico alla scheda di memoria A"
+
+#~ msgid "Send specific format to storage card B"
+#~ msgstr "Invia il formato specifico alla scheda di memoria A"
+
 #~ msgid "calibre can send your books to you (or your reader) by email"
 #~ msgstr ""
 #~ "Calibre puó mandare i vostri libri a voi (o i vostri lettori) con posta "
@@ -11218,6 +12134,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "English (IND)"
 #~ msgstr "Inglese (India)"
 
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Comunica con il Sony PRS-600/700/900 eBook reader."
+
 #~ msgid "Double click to change a keyborad shortcut"
 #~ msgstr "Doppio click per cambiare una scorciatoia da tastiera"
 
@@ -11263,5 +12182,20 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "No text &justification"
 #~ msgstr "Nessuna &giustificazione del testo"
 
+#~ msgid "&Transliterate unicode characters to ASCII."
+#~ msgstr "&Converti da caratteri unicode a ASCII."
+
+#~ msgid "(%d found)"
+#~ msgstr "(%d trovato)"
+
 #~ msgid "Delete current search and clear search box"
 #~ msgstr "Elimina ricerca corrente e svuota la casella di ricerca"
+
+#~ msgid "justify"
+#~ msgstr "giustifica"
+
+#~ msgid "left"
+#~ msgstr "sinistra"
+
+#~ msgid "original"
+#~ msgstr "originale"
diff --git a/src/calibre/translations/lv.po b/src/calibre/translations/lv.po
index 6994b18b20..6792a4dfef 100644
--- a/src/calibre/translations/lv.po
+++ b/src/calibre/translations/lv.po
@@ -7,175 +7,175 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:19+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:48+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-05-30 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: LATVIA\n"
 "X-Poedit-Language: Latvian\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "Pilnīgi neko nedara"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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 "Nav zināms"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "Faila tips"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "Metadatu lasītājs"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Metadatu rakstītājs"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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."
@@ -183,64 +183,64 @@ msgstr ""
 "Rakstzīmju kodējums avota HTML failiem. Bieži vien tiek izmantots: cp1252, "
 "latin1, iso-8859-1 un utf-8."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "Izvilkt vāku no komiksu failiem"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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 "Lasīt metadatus no %s failiem"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lasīt metadatus no e-grāmatām RAR arhīvos"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lasīt metadatus no e-grāmatām ZIP arhīvos"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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 "Ierakstīti metadati %s failos"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -248,159 +248,159 @@ msgid ""
 "encoding declarations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "Ievadprofils"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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/trunk/src/calibre/customize/profiles.py:69
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Šis profils ir paredzēts Microsoft Reader."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Šis profils ir paredzēts Mobipocket grāmatām"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "Šis profils ir paredzēts Cybook G3."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Šis profils ir paredzēts Cybook Opus."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Šis profils ir paredzēts Amazon Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Šis profils ir paredzēts Irex Illiad."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Šis profils ir paredzēts IRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "Izvadprofils"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 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/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Šis profils ir paredzēts Amazon Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "Uzstādītie spraudņi"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "Atspējotie spraudņi"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -408,528 +408,567 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 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/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "Komunicē ar Android telefoniem."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "Komunicē ar Blackberry viedtelefonu."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /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/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Komunicē arEB600 e-grāmatu lasītāju"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Komunicē arESlick e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
+#: /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/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Komunicē arIRex Iliad e-grāmatu lasītāju."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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 "Ierīču saskarnes"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /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:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+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 "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
+msgid "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 "Komunicē ar IRex Digital Reader 1000 e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Komunicē ar JetBook e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Komunicē ar Kindle e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Komunicē ar Kindle 2 e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "Komunicē ar Nuut2 e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Komunicē ar Sony PRS-500 e-grāmatu lasītāju."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:89
-msgid "Getting list of books on device..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
+msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Dzēš grāmatas no ierīces..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Sūta ierīcei grāmatu metadatus..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "Ziņas"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Ierīces uzstādījumi"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "Sūta ierīcei grāmatu metadatus..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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 "Lapa"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -955,65 +994,65 @@ msgid ""
 "For full documentation of the conversion system see\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "Parādīt iebūvētās receptes"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1021,7 +1060,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1029,7 +1068,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1037,7 +1076,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1046,17 +1085,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1064,58 +1103,58 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1125,7 +1164,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1133,39 +1172,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1174,73 +1213,73 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1250,7 +1289,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1260,111 +1299,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1373,21 +1412,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1395,7 +1434,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1404,42 +1443,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1447,152 +1486,152 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr "Veido LIT failu no EPUB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "Apstrādā %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "Veido XML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr "LRS ierakstīts "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /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/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1601,159 +1640,163 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "Nosaukums"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "Autors(i)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "Komentāri"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "Birkas"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "Sērija"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "Valoda"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "Publicēts"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1767,120 +1810,120 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr "Nav norādīts fails"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr "Oriģinālie metadati"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr "Izmainītie metadati"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr "OPF izveidots"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr "Vāks saglabāts"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1894,41 +1937,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "Meklējamās grāmatas autors."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "Meklējamās grāmatas nosaukums."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr "Meklējamās grāmatas izdevējs."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr "Gaidot atbildi no LibraryThing.com iestājās noildze. Mēģiniet vēlāk."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " nav atrasts."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr "LibraryThing.com servera kļūda. Mēģiniet vēlāk."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -1936,158 +1979,154 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Vāks"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "Visi raksti"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr "Titullapa"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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 "Satura rādītājs"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "Bibliogrāfija"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr "Priekšvārds"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
 msgid "List of Illustrations"
 msgstr "Ilustrāciju saraksts"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 msgid "List of Tables"
 msgstr "Tabulu saraksts"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "Piezīmes"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "Priekšvārds"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Main Text"
 msgstr "Pamatteksts"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr "Iestatījumi HTML satura rādītāja ģenerēšanai."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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."
@@ -2095,9 +2134,9 @@ msgstr ""
 "Parasti calibre tukšas rindas uzskata par rindkopu atdalītājiem. Izvēloties "
 "šo opciju tiks uzskatīts, ka katra rinda ir viena rindkopa."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2105,32 +2144,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2142,114 +2181,114 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr "Atšifrēšanas iestatījumi:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr "Autors"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr "Faila izmērs"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr "PDF versija"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2258,33 +2297,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2299,11 +2338,11 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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!"
@@ -2311,80 +2350,86 @@ msgstr ""
 "Mērvienība. Pēc noklusējuma izmanto collas. Iespējamie varianti: %s. "
 "Piezīme: Šis parametrs nemaina attālumus no malām."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2392,296 +2437,443 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Nokopēts"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Kopēt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Kopēt uz starpliktuvi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Pievieno..."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Pievienots"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Pievienošana neveiksmīga"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Atrasti dublikāti!"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Saglabā..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Saglabāts"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2690,135 +2882,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr "Masveida pārveidošana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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 "&Rezultāta formāts:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr "Atkļūdošana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2826,105 +3018,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " KB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -2940,577 +3092,577 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr "0.0 pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr "Izskats un sajūtas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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 "Vednis, kurš palīdzēs izvēlēties piemērotu šrifta izmēru"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr "&Linearizēt tabulas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr "Papildus &CSS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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 "Metadati"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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 "Izvēlēties vāku "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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 "Kļūda nolasot failu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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 "Grāmatas vāks"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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 "Mainīt grāmatas &vāku:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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 "Izvēlēties attēlu, kuru izmantos kā šīs grāmatas vāku."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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 "&Nosaukums "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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 "Maina šīs grāmatas nosaukumu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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 "&Autors(i): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr "Autors kā&rtošanai:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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 ""
 "Mainīt šīs grāmatas autoru(s). Ja autori ir vairāki, tie jāatdala ar komatu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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 "&Izdevniecība: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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 "&Birkas: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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 "&Sērija:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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 "Zināmo sēriju saraksts. Jūs varat pievienot jaunas sērijas."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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 "Grāmata "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "Lappuses iestatījumi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "Profila apraksts"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr "Atvērt grāmatu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr "Priekšskats"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr "&Sākotnējais formāts:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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 "Nederīgs XPath"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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 izteiksme %s ir nekorekta"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
@@ -3518,157 +3670,161 @@ msgstr ""
 "Satura\n"
 "rādītājs"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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 "TextLabel"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr "*"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr "a"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr "br"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr "div"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr "h1"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr "h2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr "h3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr "h4"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr "h5"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr "h6"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr "hr"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr "span"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr "(regulārā izteiksme)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3678,344 +3834,405 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "un dzēst no bibliotēkas"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr "Sūtīt uz pamatatmiņu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr "Sūtīt uz karti A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr "Sūtīt uz karti B"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "E-grāmata:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "Atrodas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "Formāti"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "Izvēlieties formātu"
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
 msgstr "spraudņi"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
 msgstr "Pārveidošana"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
 msgstr "Saskarne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Add/Save"
 msgstr "Pievienošana/Saglabāšana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
@@ -4023,11 +4240,11 @@ msgstr ""
 "Epasta\n"
 "piegāde"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
@@ -4035,164 +4252,191 @@ msgstr ""
 "Satura\n"
 "serveris"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
 msgstr "Spraudņi"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr "E-pasts"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "Kļūda"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s nav derīga spraudņu atrašanās vieta"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Izvēlieties spraudni"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Spraudni nevar atspējot"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "Spraudni %s nevar atspējot"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Spraudnis nav pielāgojams"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "Spraudnim %s nav nepieciešama pielāgošana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "Kļūdu žurnāls:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4200,32 +4444,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4236,80 +4480,80 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -4317,248 +4561,264 @@ 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr "Izvēlēties jaunu datubāzes atrašanās vietu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr "Informēt, kad pieejama &jauna versija"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " sekundes"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr "Izvēlieties va&lodu (nepieciešams pārstartēt):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "Standarta"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr "Augsta"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr "Zema"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr "Darbu &prioritāte:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr "Vēlamais &rezultāta formāts:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Rīkjosla"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr "Liela"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr "Vidēja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr "Maza"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4568,121 +4828,234 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "Datums"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4691,69 +5064,65 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "Vai esat pārliecināts?"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "KĻŪDA"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Autors kārtošanai"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr "Meklē metadatus..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr "Nav iespējams atrast metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr "Metadati netika atrasti"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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 ""
 "Metadati netika atrasti. Mēģiniet pamainīt autoru un nosaukumu vai ISBN kodu."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr "Lejupielādēt metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4765,76 +5134,71 @@ msgstr ""
 "ievadīt pieejas kodu, kuru var iegūt reģistrējoties <a "
 "href=\"http://www.isbndb.com\">bez maksas</a>.</p>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr "Pieejas &kods:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr "Meklēt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr "Rezultāti"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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 ""
 "No zemāk esošā saraksta izvēlieties grāmatu, kura ir visvairāk atbilst "
 "meklētajai."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "Rediģēt metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "Metadati"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr "Autors &kārtošanai: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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."
@@ -4842,55 +5206,55 @@ msgstr ""
 "Norāda grāmatas autora(u) kārtošanas secību. Piemēram, Čārlzs Dikenss būtu "
 "jākārto kā Dikenss, Čārlzs."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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 "&Vērtējums:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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 "Šīs grāmatas vērtējums (0 - 5 zvaigznes)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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 " zvaigznes"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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 "Atvērt birku redaktoru"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -4898,615 +5262,801 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "Izvēlieties formātus "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "Grāmatas"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr "Lejupielādē vāku..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr "Lejupielādes noildze."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 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/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "Slikts vāks"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Rediģēt metadatus"
 
-#: /home/kovid/work/trunk/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 "Metadati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
 msgstr "Mainīt vietām autoru un nosaukumu"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "I&zdota:"
 
-#: /home/kovid/work/trunk/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 "yyyy.MM.dd"
 
-#: /home/kovid/work/trunk/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 "&Datums:"
 
-#: /home/kovid/work/trunk/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 "&Kometāri"
 
-#: /home/kovid/work/trunk/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 "Lejupielādēt &metdatus"
 
-#: /home/kovid/work/trunk/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 "Pieejamie formāti"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "Uzstāda vāka attēlu izvēlētā formāta grāmatai"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "Lejupielādēt &vāka attēlu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr "Nepieciešama parole"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Nepieciešams lietotājvārds un parole"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
 msgid "Created by: "
 msgstr "Izveidoja: "
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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 "Receptes"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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 "Katru "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "dienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "pirmdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "otrdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "trešdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "ceturtdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "piektdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "sestdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "svētdienu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "satur"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr "Paplašinātā meklēšana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr "Bet nerādīt ierakstus, kuriem..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:72
+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
+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 "Vai esat pārliecināts?"
 
-#: /home/kovid/work/trunk/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?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "Birku redaktors"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr "Jau eksistē"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr "Izvēlieties recepti"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5520,62 +6070,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5599,748 +6149,895 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "Statuss"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "Progress"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "Izmērs (MB)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "Vērtējums"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "Nav"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "<font face=\"serif\">%s</font>. no %s grāmatām."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr "Izmantot baltu fonu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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 "Nākošā lapa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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 "Iepriekšējā lapa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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 "Atpakaļ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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 "Uz priekšu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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 "Atvērt e-grāmatu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr "Nemeklēt atjauninājumus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "Paplašinātā meklēšana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "&Meklēt:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "Kārtot pēc &popularitātes"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "Pievienot grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "Dzēst grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "Rediģēt metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "Sūtīt uz ierīci"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "Saglabāt diskā"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "Pārveidot e-grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Skatīt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "Atvērt katalogu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "Parādīt grāmatas detaļas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "Šī paša autora grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "Šīs sērijas grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "Grāmatas ar tādām pašām birkām"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr "Grāmatai nav ne nosaukuma ne ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "Meklēt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /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/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr "Darbi:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/sidebar.py:84
+msgid "Hide Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "Autori"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr "Rediģēt metadatus grāmatai"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr "Rediģēt metadatus masveidā"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /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/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr "Lejupielādēt tikai metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr "Lejupielādēt tikai vākus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /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/trunk/src/calibre/gui2/ui.py:294
+#: /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)"
@@ -6349,7 +7046,7 @@ msgstr ""
 "(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/trunk/src/calibre/gui2/ui.py:297
+#: /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)"
@@ -6358,93 +7055,105 @@ msgstr ""
 "(Vairākas grāmatas katalogā, atsevišķi e-grāmatu faili tiek uzskatīti par "
 "dažādām grāmatām)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr "Masveida pārveidošana"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr "Līdzīgas grāmatas..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Pārlūkot vākus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Ierīce: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6460,204 +7169,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "EPUB grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "LRF grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "HTML grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "LIT grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "MOBI grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "PDF grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Komiki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Arhīvi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 "Nav izvēlēta grāmata"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Nav iespējams lejupielādēt metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "vāki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metadati"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Nav iespējams lejupielādēt daļu metadatu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr "Nevarēja lejuplādēt metadatus:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Nevar lejuplādēt metadatus:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 "Nav iespējams rediģēt metadatus"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6665,7 +7380,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6675,93 +7390,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Nav iespējams saglabāt diskā"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Kļūda saglabājot"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 "Dažas grāmatas nevarēja saglabāt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Nav iespējams pārveidot"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Izvēlētas vairākas grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6769,568 +7480,581 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Pieejams atjauninājums"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr "Rediģēt grāmatzīmi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr "Jaunais grāmatzīmes nosaukums:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr "Eksportēt grāmatzīmes"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr "Saglabātās grāmatzīmes (*.pickle)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr "Importēt grāmatzīmes"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr "Nosaukums"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr "Darbības"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr "Rediģēt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr "Dzēst"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr "Eksportēt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr "Importēt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr "Grāmatas formāts"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr "Kopēt uz starpliktuvi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr "Drukāt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
@@ -7340,167 +8064,164 @@ msgstr ""
 "%d\n"
 "grāmatas"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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 "Laipni lūdzam calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7509,150 +8230,150 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr "Izvēlieties va&lodu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr "Izmantot Gmail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7660,45 +8381,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7707,7 +8439,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7715,14 +8447,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7731,14 +8463,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7747,28 +8479,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7777,7 +8509,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7787,27 +8519,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7816,61 +8548,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:232
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
 msgid "Sort results in ascending order"
 msgstr "Kārtot rezultātus augošā secībā"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
 msgstr "Neatļauti lauki. Pieļaujamie lauki:"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:270
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
 msgstr "Neatļauts meklēšanas lauks. Pieejamie lauki:"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7879,43 +8605,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7924,11 +8650,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7937,15 +8663,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7955,11 +8681,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Jānorāda id un formāts"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -7969,15 +8695,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr "Jānorāda id"
 
-#: /home/kovid/work/trunk/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"
@@ -7990,11 +8716,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8005,27 +8731,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8036,23 +8762,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8063,30 +8789,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8098,17 +8824,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8117,19 +8843,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8139,15 +8865,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8159,111 +8885,127 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Kopē <b>%s</b>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr "Nosaukums"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr "Autori"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr "Birkas"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr "Vērtējums"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr "Datums"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr "Izdošanas datums"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8271,7 +9013,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8279,7 +9021,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8287,422 +9029,500 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr "Aizvietot atstarpes ar apakšsvītrām"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "Lietotāja saskarnes valoda"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr "Ķīniešu (HK)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Lejupielāde pabeigta"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " no "
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Mēģina lejupielādēt vāku..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Lejupielādē vāku no %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8711,7 +9531,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -8755,3 +9575,6 @@ msgstr ""
 
 #~ msgid "Communicate with the Sony PRS-600/700 eBook reader."
 #~ msgstr "Komunicē ar Sony PRS-600/700 e-grāmatu lasītāju."
+
+#~ msgid "and delete from library"
+#~ msgstr "un dzēst no bibliotēkas"
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index 1e1d8301fa..e7e9cee6ad 100644
--- a/src/calibre/translations/pl.po
+++ b/src/calibre/translations/pl.po
@@ -7,166 +7,166 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:27+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:39+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-05-30 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "Ta opcja zupełnie nic nie zmienia"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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 "Nieznany"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "Baza"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "Typ pliku"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "Czytnik metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Zapisywanie metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Generator katalogu"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 "
@@ -176,7 +176,7 @@ msgstr ""
 "zawierający wszystkie podlinkowane pliki. Ta wtyczka jest uruchamiana za "
 "każdym razem, gdy dodasz plik HTML do biblioteki."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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."
@@ -184,7 +184,7 @@ msgstr ""
 "Kodowanie znaków dla źródłowych plików HTML. Popularne wybory to: cp1252, "
 "latin1, iso-8859-1 i utf-8."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -194,57 +194,57 @@ msgstr ""
 "pmlname_img lub images. Plugin ten jest uruchamiany przy każdym dodaniu "
 "pliku PML do biblioteki."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "Wyodrębnij okładki z plików komisów"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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 "Odczytaj metadane z %s plików"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Odczyt metadanych z e-booków w archiwach RAR"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Odczyt metadanych z e-booków w archiwach ZIP"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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 "Ustaw metadane w %s plikach"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "Pobierz metadane z %s plików"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "Źródłowy format do konwersji"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -256,11 +256,11 @@ msgstr ""
 "Szczególnie przydatne w przypadku dokumentów, które nie deklarują kodowania "
 "lub które mają błędne deklaracje kodowania."
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "Docelowy format po konwersji"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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."
@@ -269,11 +269,11 @@ msgstr ""
 "dane, tak by były jak najbardziej czytelne dla człowieka. Dla niektórych z "
 "wtyczek generujących dane wyjściowe może nie dawać to żadnych efektów ."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "Profil źródłowy"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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."
@@ -281,84 +281,84 @@ msgstr ""
 "Ten profil próbuje zapewnić rozsądne wartości domyślne i jest użyteczny, "
 "jeśli nie wiesz nic o dokumencie wejściowym."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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 ""
 "Ten profil przeznaczony jest dla urządzeń SONY z linii PRS. 500/505/600/700 "
 "itp."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:69
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr "Ten profil przeznaczony jest dla urządzenia SONY PRS-300."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Ten profil przeznaczony jest dla urządzenia SONY PRS-900."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Ten profil przeznaczony jest dla programu Microsoft Reader."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Ten profil przeznaczony jest dla urządzeń Mobipocket."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "Ten profil przeznaczony jest dla urządzenia Cybook G3."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Ten profil przeznaczony jest dla urządzenia Cybook Opus."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Ten profil przeznaczony jest dla urządzenia Amazon Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Ten profil przeznaczony jest dla urządzenia Irex Illiad."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Ten profil przeznaczony jest dla urządzenia B&N Nook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "Profil wyjściowy"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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 "
@@ -368,24 +368,24 @@ msgstr ""
 "jeśli chcesz stworzyć dokument przeznaczony do odczytu na komputerze lub "
 "większej liczbie urządzeń."
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 "Ten profil przeznaczony jest dla urządzenia Kobo Reader."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Ten profil przeznaczony jest dla urządzenia SONY PRS-300."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Ten profil przeznaczony jest dla 5 calowego urządzenia JetBook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -393,35 +393,35 @@ 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/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ten profil przeznaczony jest dla urządzenia Amazon Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "Zainstalowane wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "Mapowanie wtyczek dla róznych typów plików"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "Lokalne dostosowanie wtyczek"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "Wyłączone wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "Nie znaleziono wtyczki w "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicjacja wtyczki %s nie udała się - prześledź komunikaty:"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -433,16 +433,16 @@ msgstr ""
 "    Spersonalizuj calibre poprzez załadowanie zewnętrznych wtyczek\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 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/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 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/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -450,23 +450,23 @@ msgstr ""
 "Dostosuj wtyczkę. Wprowadź nazwę wtyczki i polecenie dostosowujące "
 "oddzielając przecinkami."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "Wyświetl wszystkie zainstalowane wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "Włącz wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "Wyłącz wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "Umożliwia komunikację z telefonami z Androidem."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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"
@@ -474,173 +474,214 @@ 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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr "Umożliwia komunikację z telefonami S60."
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /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."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "Umożliwia komunikację z telefonami Blackberry."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem Cybook Gen 3 / Opus."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek EB600."
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr "Umożliwia komunikację z czytnikiem Entourage Edge."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek ESlick."
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Umożliwia komunikację z czytnikiem książek Hanlin V3."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Umożliwia komunikację z czytnikiem książek Hanlin V5."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "Umożliwia komunikację z czytnikiem książek BOOX."
-
-#: /home/kovid/work/trunk/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."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "Umożliwia komunikację z czytnikiem SpringDesign Alex eBook."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr "Umożliwia komunikację z czytnikiem Azbooka."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Umożliwia komunikację z czytnikiem książek Elonex EB 511."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Umożliwia komunikację z czytnikiem książek IRex Iliad."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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 "Interfejs urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+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
+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
+msgid "Communicate with the BOOX eBook reader."
+msgstr "Umożliwia komunikację z czytnikiem książek BOOX."
+
+#: /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."
+
+#: /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 "Umożliwia komunikację z czytnikiem SpringDesign Alex eBook."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
+msgid "Communicate with the Azbooka"
+msgstr "Umożliwia komunikację z czytnikiem Azbooka."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr "Umożliwia komunikację z czytnikiem książek Elonex EB 511."
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "Umożliwia komunikację z czytnikiem książek IRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "Umożliwia komunikację z czytnikiem książek IRex Digital Reader 800."
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Iriver Story."
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek JetBook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Kindle 2."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr "Umożliwia komunikację z czytnikiem Kobo Reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "Umożliwia komunikację z telefonem Palm Pre."
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr "Umożliwia komunikację z czytnikiem Booq Avant"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Umożliwia komunikację z internetowym tabletem Nokia 770."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "Umożliwia komunikację z tabletem internetowym Nokia 810."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "Nook"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Nook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Nuut2."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Sony PRS-500."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:89
-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/prs505/driver.py:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "Umożliwia komunikację z czytnikami książek Sony PRS-300/505/500."
-
-#: /home/kovid/work/trunk/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: "
@@ -648,62 +689,44 @@ msgstr ""
 "Lista oddzielonych przecinkami pól metadanych do włączenia do zbiorów w "
 "urządzeniu. Możliwości obejmują: "
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "Przenoszenie książek na urządzenie..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "Nienazwany"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Usuwanie książek z urządzenia..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Przesyłanie danych meta do urządzenia..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "Umożliwia komunikację z czytnikami książek Sony PRS-600/700/900."
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem Samsung SNE eBook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "Umożliwia komunikację z czytnikiem książek Teclast K3."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Wykrycie dysku %s niemożliwe. Spróbuj ponownie uruchomić komputer."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 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/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "Nie można wykryć %s dysku."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "Nie można znaleźć pomocnika montowania: %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -711,178 +734,194 @@ msgstr ""
 "Nie można wykryć %s dysku. Jądro jest prawdopodobnie eksportujących "
 "przestarzała wersja SYSFS."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 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/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 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/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "Wybrane gniazda: %s nie jest obsługiwany."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "Niewystarczająca ilość wolnej pamięci głównej"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "Na karcie pamięci jest niewystarczająca ilość wolnego miejsca"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "Aktualności"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Konfiguruj urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "ustawienia dla sterowników urządzeń"
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
 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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "Odczytaj dane meta z książek na urządzeniu"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "Szablon do kontrolowania sposobu, w jaki książki są zapisywane"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "Dodatkowa personalizacja"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "Pobierz informacje o urządzeniu..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "Dodanie książki do urządzenia metadanych lista..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "Usuwanie książki z urządzenia metadanych lista"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "Przesyłanie danych meta do urządzenia..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "Katalog docelowy. Domyślnie aktualny katalog"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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 "Ustaw tytuł książki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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 "Ustaw klucz sortowania dla tytułu"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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 "Ustaw autora"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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 "Ustaw klucz sortowania dla autorów"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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 "Kategoria do jakiej należy tak książka np.: Historia"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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 "Ściezka do grafiki, która ma być miniaturką tego pliku."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr "Ścieżka do pliku TXT zawierającego komentarz."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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 "Wypakuj miniaturkę z pliku LRF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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 "Ustaw wydawcę"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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 "Wpisz klasyfikację książki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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 "Wpisz twórcę książki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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 "Ustaw wytwórcę książki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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 "Wpisz identyfikator książki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr "Wykonane %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "Nieudane %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
@@ -892,7 +931,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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 "
@@ -902,24 +941,24 @@ msgstr ""
 "Wartości mniejszej niż 256 może powodować niewyraźne tekst na urządzeniu, "
 "jeśli tworzenia komiksów w formacie EPUB."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:283
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:283
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Nie zezwalaj na normalizowanie (poprawianie kontrastu) głębi kolorów. "
 "Domyślne: Fałsz"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:286
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 "Zachowuj proporcję wymiarów grafiki. Domyślnie grafika rozszerzana jest na "
 "cały ekran."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "Wyłącz wyostrzanie"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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."
@@ -927,11 +966,11 @@ msgstr ""
 "Wyłącz przycięcie komiks stron. Dla niektórych komiksy, przycinanie może "
 "usunąć treści, jak również granice."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:293
 msgid "Don't split landscape images into two portrait images"
 msgstr "Nie dziel grafik panoramicznych na dwie części"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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."
@@ -939,7 +978,7 @@ msgstr ""
 "Zachowaj format i skalę obrazu używając wysokości ekranu jako szerokość "
 "obrazu podczas wyświetlania w trybie panoramicznym."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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."
@@ -947,7 +986,7 @@ msgstr ""
 "Służy do prawej do lewej publikacje jak manga. Przyczyny stron krajobraz "
 "była podzielona na stronach portret od prawej do lewej."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:302
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:302
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -955,7 +994,7 @@ msgstr ""
 "Włącza odplamiacz. Zmniejsza zakłócenia powodowane plamami. Może znacznie "
 "wydłużyć czas przetwarzania."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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."
@@ -963,7 +1002,7 @@ msgstr ""
 "Nie sortowanie plików znajdujących się w komiks alfabetycznie według nazwy. "
 "Zamiast korzystać z kolejności, w jakiej zostały dodane do komiksu."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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 "
@@ -972,20 +1011,20 @@ msgstr ""
 "Format zdjęcia w stworzonym ebook są zamieniane na. Można eksperymentować, "
 "aby zobaczyć, w jakim formacie daje optymalny rozmiar i wygląd urządzenia."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "Nie uruchamiaj żadnych przekształceń obrazka."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315
 msgid "Do not convert the image to grayscale (black and white)"
 msgstr "Nie przekształcaj grafiki do skali szarości (czarno-białe)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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 "Strona"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -1011,32 +1050,32 @@ msgid ""
 "For full documentation of the conversion system see\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "OPCJE PLIKU ŹRÓDŁOWEGO"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr "Opcje umożliwiające kontrolę nad przetwarzaniem pliku źródłowego %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "OPCJE PLIKU WYJŚCIOWEGO"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "Opcje umożliwiające kontrolę nad przetwarzaniem pliku wyjściowego %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:119
 msgid "Options to control the look and feel of the output"
 msgstr ""
 "Opcje umożliwiające kontrolę nad wyglądem i zachowaniem pliku wyjściowego"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "Kontrola autodetekcji struktury dokumentu."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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 "
@@ -1046,34 +1085,34 @@ msgstr ""
 "źródłowy ma już spis treści, to ma on pierwszeństwo przed tym wygenerowanym "
 "automatycznie."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "Opcje odpowiedzialne za ustawienia metadanych w plikach wyjściowych"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "Opcje pomocy przy debugowaniu konwersji"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "Lista wbudowanych źródeł"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr "Plik wyjściowy zapisany do"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1081,7 +1120,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1089,7 +1128,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1097,7 +1136,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1106,11 +1145,11 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr "Nie skaluj rozmiaru czcionek."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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."
@@ -1118,7 +1157,7 @@ msgstr ""
 "Wysokość linii w punktach. Kontroluje odstęp między kolejnymi liniami "
 "tekstu. Domyślnie żadne zmiany wysokości linii nie są zastosowane."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1126,7 +1165,7 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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 "
@@ -1136,7 +1175,7 @@ msgstr ""
 "zawartości spisu treści na poziomie pierwszym, przed wszystkimi formami auto-"
 "wykrywania."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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 "
@@ -1146,7 +1185,7 @@ msgstr ""
 "zawartości spisu treści na poziomie drugim. Każde wejście jest dodawane pod "
 "wcześniejszy pierwszy poziom."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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 "
@@ -1156,18 +1195,18 @@ msgstr ""
 "zawartości spisu treści na poziomie trzecim. Każde wejście jest dodawane pod "
 "wcześniejszy drugi poziom."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "Nie dodawaj automatycznie wykrytych rozdziałów do Spisu Treści"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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"
@@ -1175,20 +1214,20 @@ msgstr ""
 "Jeśli wykryto mniej niż tyle rozdziałów, odnośniki są dodawane do spisu "
 "treści (TOC). Domyślnie: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1198,7 +1237,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1210,49 +1249,49 @@ msgstr ""
 "rozdziałami. Wartość \"brak\" wyłącza zaznaczanie rozdziałów, a \"wszystko\" "
 "włącza linie i strony przerw jednocześnie."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr ""
 "Wyrażenie XPath. Znaczniki końca strony są wstawiane przez określonymi "
 "elementami."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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 ""
 "Ustaw górny margines w punktach. Domyślna wartość %default. Informacja: 72 "
 "punkty to 1 cal."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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 ""
 "Ustaw dolny margines w punktach. Domyślna wartość %default. Informacja: 72 "
 "punkty to 1 cal."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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 ""
 "Ustaw lewy margines w punktach. Domyślna wartość %default. Informacja: 72 "
 "punkty to 1 cal."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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 ""
 "Ustaw prawy margines w punktach. Domyślna wartość %default. Informacja: 72 "
 "punkty to 1 cal."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1261,27 +1300,27 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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 "Preferuj okładkę z pliku źródłowego w stosunku do wybranej okładki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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)."
@@ -1289,7 +1328,7 @@ msgstr ""
 "Wstaw pusta linię pomiędzy paragrafami. Ustawienie nie będzie działać, jeśli "
 "plik źródłowy nie używa pragrafów (znaczników <p> lub <div>)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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."
@@ -1298,7 +1337,7 @@ msgstr ""
 "książka na pierwszej stronie zawiera okładkę, a ty wybrałeś okładkę "
 "zewnętrzną."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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."
@@ -1306,29 +1345,29 @@ msgstr ""
 "Wstaw metadane książki na początku książki. Jest to przydatne, jeśli czytnik "
 "ebook nie obsługuje wyświetlania / wyszukiwanie metadanych bezpośrednio."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367
 msgid "Use a regular expression to try and remove the header."
 msgstr "Użyj wyrażenia regularnego aby spróbować usunąć nagłówek."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:374
 msgid "The regular expression to use to remove the header."
 msgstr "Wyrażenie regularne używane do usuwania nagłówka."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:380
 msgid "Use a regular expression to try and remove the footer."
 msgstr "Użyj wyrażenia regularnego aby spróbować usunąć stopkę."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:387
 msgid "The regular expression to use to remove the footer."
 msgstr "Wyrażenie regularne używane do usuwania stopki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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."
@@ -1336,7 +1375,7 @@ msgstr ""
 "Odczytaj metadane ze wybranego pliku OPF. Metadane odczytane z tego pliku "
 "nadpiszą każde metadane pliku źródłowego."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1346,7 +1385,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1356,113 +1395,113 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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 "Wpisz tytuł."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
 msgid "Set the authors. Multiple authors should be separated by ampersands."
 msgstr ""
 "Wpisz autorów. Jeśli jest więcej niż jeden, należy oddzielić ich znakami et "
 "(\"&\")."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 msgid "The version of the title to be used for sorting. "
 msgstr "Wersja tytułu używana przy sortowaniu. "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr "Łańcuch znaków używany przy sortowaniu po autorze. "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
 msgstr "Ustaw okładkę wybierjąć plik lub podając adres URL."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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 "Wpisz opis książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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 "Wpisz wydawcę książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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 "Wpisz serię, do której należy książka."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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 "Ustaw indeks ksiązki w serii."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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 "Wpisz ocenę. Musi to być cyfra pomiędzy 1 a 5."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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 "Wpisz numer ISBN książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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 "Wpisz etykiety dla książki. Kolejne etykiety oddzielaj przecinkami."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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 "Wpisz język."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr "Ustaw datę publikacji."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "Nie znaleziono książki w archiwum"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
 msgstr "Wartości indeksu serii i oceny muszą być cyframi. Ignoruję"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr "Nie udało się porzetworzyć daty/czasu"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr "Konwertuję plik źródłowy na plik HTML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr "Wykonywanie przekształceń na książce..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr "Tworzenie"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1471,7 +1510,7 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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 "
@@ -1482,14 +1521,14 @@ msgstr ""
 "dużych rozmiarach. Domyślna wartość %defaultKB to rozmiar wymagany przez "
 "Adobe Digital Editions."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1497,7 +1536,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1506,42 +1545,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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 "Spis treści:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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 "Nie wstawiaj spisu treści na początku książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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 "Dodaj spis treści na początku książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1549,66 +1588,66 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr "Stwórz plik LIT z pliku EPUB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr "\twykryto plik Book Designer."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr "\tAnalizowanie HTML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tWykryto plik Baen. Ponowna analiza..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr "Zapisano wstępnie przetworziny HTML do "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "Przetwarzanie %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr "\tKonwersja do BBeB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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 "Nie można przetworzyć pliku: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr "%s jest pustym plikiem"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr "Analiza odnośnika %s %s nie powiodła się"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr "Nie można dodać odnośnika %s do spisu treści"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
 msgstr "Nie można przetworzyć obrazu %s. Błąd: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr "Nie można było przetworzyć pliku PNG z przepolotem %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1616,12 +1655,12 @@ msgstr ""
 "Nie można przetworzyć grafiki: %s\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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 "Błąd podczas przetwarzania tabeli: %s. Ignoruję znaczniki tabel."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1629,23 +1668,23 @@ msgstr ""
 "Nieprawidłowy spis:\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
 msgid "Table has cell that is too large"
 msgstr "Tabela zawiera zbyt dużą komórkę"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr "Nie można odczytać grafiki okładki: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr "Nie można odczytać z: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr "Nie udało się przetworzyć pliku opf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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"
@@ -1653,31 +1692,31 @@ msgstr ""
 "%prog book.lrf\n"
 "Konwertuje plik LRF do pliku LRS (rozkodowanego jako XML UTF-8 encoded)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr "Wyjściowy plik LRS"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
 msgid "Do not save embedded image and font files to disk"
 msgstr "Nie zapisuj zagnieżdżonych w pliku grafik i czcionek na dysku"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr "Analizowanie LRF..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "tworzenie XML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr "Plik LRS zapisany do "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr "Nie można odczytać z pliku miniaturki:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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."
@@ -1685,24 +1724,24 @@ msgstr ""
 "%prog [opcje] file.lrs\n"
 "Skompiluj plik LRS do pliku LRF."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr "Ścieżka do pliku wyjściowego"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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 "Szczegółowe komunikaty w czasie pracy"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
 msgstr "Konwersja LRS do LRS, opcja przydatna przy debugowaniu."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr "Niewłaściwy plik LRF. Nie można ustawić metadanych."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1716,27 +1755,27 @@ msgstr ""
 "Pokaż/edytuj metadane w pliku LRF.\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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 ""
 "Ścieżka do pliku TXT zawierającego komentarz, który ma zostać zapisany w "
 "pliku LRF."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90
 msgid "Enable autorotation of images that are wider than the screen width."
 msgstr "Włącz automatyczne obracanie obrazów, które są szersze niż ekran."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
 msgstr ""
 "Ustaw odstęp pomiędzy słowami w punktach (pt). Domyślnie wynosi on %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:97
 msgid "Add a header to all the pages with title and author."
 msgstr "Dodaj nagłówek z tytułem i autorem do wszystkich stron."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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"
@@ -1744,13 +1783,13 @@ msgstr ""
 "Ustaw format nagłówka. %a jest zastępowane nazwiskiem autora, %t - tytułem "
 "książki. Styl domyślny: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
 msgstr ""
 "Dodaj dodatkowy odstęp poniżej nagłówka. Domyślna wartość to %default "
 "punktów."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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"
@@ -1758,7 +1797,7 @@ msgstr ""
 "Minimalne wcięcie paragrafu (wcięcie pierwszej linii paragrafu) w pts. "
 "Domyślnie: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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)"
@@ -1766,7 +1805,7 @@ msgstr ""
 "Wyświetlaj tabele w plikach HTML jako obrazki (przydatne, gdy dokument "
 "zawiera duże lub złożone tabele)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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"
@@ -1774,114 +1813,118 @@ msgstr ""
 "Pomnóż wielkość tekstu w wyświetlanych tabelach przez ten współczynnik. "
 "Domyślny to %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr "Rodzina czcionek szeryfowych do umieszczenia"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr "Rodzina czcionek sans-serif do umieszczenia"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr "Rodzina czcionek o stałej szerokości do umieszczenia"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr "Komiks"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "Tytuł"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "Autor(rzy)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "Komentarze"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "Etykiety"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "Seria"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "Język"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "Data"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "Opublikowana"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "Uprawnienia"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr "PRZEGLĄD REDAKCYJNY"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr "opcje"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1895,7 +1938,7 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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."
@@ -1903,7 +1946,7 @@ msgstr ""
 "Ustaw autorów. Jeśli występuje kilku autorów oddzielaj ich za pomocą znaku "
 "\"&\". Dane autorów powinny być podane w kolejności: Imię Nazwisko."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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."
@@ -1911,98 +1954,98 @@ msgstr ""
 "Wersja tytułu używana przy sortowaniu. Jeśli nie jest określona, a tytuł "
 "jest podany, zostanie ona automatycznie wygenerowana z tytułu."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr "Wybierz okładkę dla wybranego pliku."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr "Wpisz kategorię książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr "Ustaw datę publikacji."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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 "Pobierz okładkę z książki i zapisz ją do określonego pliku."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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 "Określ nazwę dla pliku OPF. Metadane zostaną zapisane w tym pliku."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr "Ustaw identyfikator książki w plikach LFR"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr "Nie wybrano pliku"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr "Oryginalne metadane"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr "Zmienione metadane"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr "Plik OPF stworzony w"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr "Okładka zapisana do"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr "Nie znaleziono okładki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Pobieranie metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr "oceny"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "tagi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
 msgstr "opis/recenzje"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr "Pobierz %s z %s"
 
-#: /home/kovid/work/trunk/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 "Pobierz metadane z Google Books"
 
-#: /home/kovid/work/trunk/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 "Pobierz metadane z isbndb.com"
 
-#: /home/kovid/work/trunk/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."
@@ -2010,11 +2053,11 @@ msgstr ""
 "Aby użyć bazy isbndb.com musisz stworzyc %sdarmowe konkto%s i wpisać poniżej "
 "klucz dostępu."
 
-#: /home/kovid/work/trunk/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 "Pobierz metadane społecznościowe z amazon.com"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -2028,29 +2071,29 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:105
 msgid "The ISBN ID of the book you want metadata for."
 msgstr "Kod ISBN książki, dla której chcesz pobrać metadane."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "Autor, którego książki mają być wyszukane."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "Tutył poszukiwane książki."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr ""
 "Czas oczekiwania na odpowiedź z LibraryThing.com minął. Spróbuj ponownie "
 "później."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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."
@@ -2058,15 +2101,15 @@ msgstr ""
 "Nie można pobrać okładki z serwera, z powodu zbyt dużego obciążenia. Spróbuj "
 "ponownie później."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " nie znaleziono"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr "Błąd serwera LibraryThing.com. Spróbuj ponownie poźniej."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -2074,20 +2117,20 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Okładka"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr "Przekształć grafiki tak, aby odpowiadały limitom urządzenia Palm."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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."
@@ -2095,149 +2138,145 @@ msgstr ""
 "Nie dodawaj spisu treści na końcu książki. Użyteczne jeśli książka posiada "
 "własny spis treści."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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 "Tytuł dla automatuycznie wygenerowanego spisu treści."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr "Wyłącz kompresję zawartości pliku."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "Wszystkie artykuły"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr "Strona tytułowa"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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 "Spis treści"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr "Spis"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr "Słowniczek"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr "Podziękowania"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr "Kolofon"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr "Dedykacja"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr "Epigraf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr "Przedsłowie"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
 msgid "List of Illustrations"
 msgstr "Lista ilustracji"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 msgid "List of Tables"
 msgstr "Lista tabel"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "Notatki"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "Wstęp"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Main Text"
 msgstr "Tekst główny"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "książki formatu %s nie są wspierane"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr "Opcje generowania spisu treści w HTML."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr "Obwoluta"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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 ""
 "Nie można znaleźć odpowiedniego punktu do podziału %s. Rozmiar pod-drzewa: "
 "%d KB"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "Nienazwany"
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr "Opcje generowania pilków OPF/NCX/itp."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr "Wersja OPF do wygenerowania. Domyślnie %default."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr "Pasek boczny"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2245,32 +2284,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr "Nie pobieraj grafik z dokumentu"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr "Używaj nowego silnika konwersji do formatu PDF."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2282,7 +2321,7 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2292,108 +2331,108 @@ msgstr ""
 "\n"
 "Przytnij plik PDF..\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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 ""
 "Ścieżka do pliku wyjściowego. Domyślnie jest on tworzony w katalogu bieżącym."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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 "Liczba pikseli do przycięcia od lewej osi X (domyślnie %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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 "Liczba pikseli do przycięcia od lewej osi Y (domyślnie %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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 "Liczba pikseli do przycięcia od prawej osi X (domyślnie %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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 "Liczba pikseli do przycięcia od prawej osi Y (domyślnie %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr "Opcje przycinania:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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 "Opcje związane z transformacjami plików PDF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr "Opcje dekodowania:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr "Opcje kodowania:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr "Autor"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr "Temat"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr "Autor"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr "Strony"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr "Rozmiar pliku"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr "Wersja PDF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2402,33 +2441,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr "Opcje scalania:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr "Opcje obracania:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2443,11 +2482,11 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr "Opcje dzielenia:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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!"
@@ -2455,7 +2494,7 @@ msgstr ""
 "Jednostka miary. Domyślnie cale. Aktualnie to %s. Uwaga: Ta opcja nie "
 "zmienia jednostek miar dla marginesów!"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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"
@@ -2463,7 +2502,7 @@ msgstr ""
 "Rozmiar papieru. Rozmiar ten będzie nadpisany, jeśli używany jest któryś z "
 "profili wyjścia. Domyślny rozmiar to rozmiar listu. Do wyboru masz %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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."
@@ -2472,40 +2511,40 @@ msgstr ""
 "szerokośćxwysokość np. \"123x321\". Nadpisuje każde domyślne ustawienia "
 "papieru."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr "Orientacja strony. Domyślnie pionowo. Aktualnie %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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 ""
 "Określ kodowanie znaków dla dokumentu wyjściowego. Domyślne kodowanie to UTF-"
 "8."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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 "
@@ -2515,30 +2554,36 @@ msgstr ""
 "kompresja, ale najszybsze generowanie dokumentu, a 10 to najwyższa "
 "kompresja, ale najwolniejsze generowanie dokumentu."
 
-#: /home/kovid/work/trunk/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/trunk/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 "Nie wstawiaj spisu treści do dokumentu wyjśćiowego."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2546,300 +2591,447 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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 ""
 "Wyślij plik do karty pamięci zamiast domyślnie ustawionej głównej pamięci."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr "Potwierdź przed usunięciem"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr "Wielkość ikon na paskach narzędzi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
 msgstr "Pokaż etykiety przycisków na pasku narzędzi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr "Struktura głównego okna"
 
-#: /home/kovid/work/trunk/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 "Powiadom mnie, gdy dostępna jest nowa wersja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Use Roman numerals for series number"
 msgstr "Używaj numeracji rzymskiej do numerowania serii"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr "Sortuj etykiety według popularności"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Liczba okładek wyświetlanych w trybie przeglądania okładek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr "Domyślne wartości dla konwersji do LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Lista formatów które będą otwierane w wewnętrznej przeglądarce"
 
-#: /home/kovid/work/trunk/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 "Kolumny wyświetlane na liście książek"
 
-#: /home/kovid/work/trunk/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 "Automatycznie włączaj serwer zawartości przy starcie aplikacji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Oldest news kept in database"
 msgstr "Najstarsze aktualności trzymane w bazie danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
 msgid "Show system tray icon"
 msgstr "Pokaż ikonę w zasobniku systemowym"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Upload downloaded news to device"
 msgstr "Prześlij pobrane aktualności na urządzenie"
 
-#: /home/kovid/work/trunk/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 "Usuń książki z biblioteki po przesłaniu ich na urządzenie"
 
-#: /home/kovid/work/trunk/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/trunk/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 "Zablokuj powiadomienia z ikony w zasobniku systemowym"
 
-#: /home/kovid/work/trunk/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 ""
 "Domyślne działanie do wykonania, gdy został kliknięty przycisk przesyłania "
 "na urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Maximum number of waiting worker processes"
 msgstr "Maksymalna liczba oczekujących zadań"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Pobierz metadane społecznościowe (etykiety/oceny/itd.)"
 
-#: /home/kovid/work/trunk/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 "Nadpisz autora i tytuł z nowych metadanych"
 
-#: /home/kovid/work/trunk/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 ""
 "Ogranicz maksymalną liczbę jednocześnie przetwarzanych zadań do liczby rdzeni"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Skopiowano"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Kopiuj do schowka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Wybiesz pliki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Szukam w"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Dodawanie..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr "Szukaj we wszystkich podfolderach..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Błędna ścieżka"
 
-#: /home/kovid/work/trunk/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 "Wybrany folder nie może byc przetworzony."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr "Brak książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 "Nie znaleziono książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Dodano"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Dodawanie nie powiodło się"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Znleziono duplikaty!"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Dodawanie duplikatów..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Zapisano"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "Opcje CVS/XML"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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 "Opcje specyficzne dla"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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 "wyjście"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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 "Formularz"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr "Opcje książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
 msgid "'Mark this book as read' tag:"
 msgstr "Etykieta 'Oznacz tę książkę jako przeczytaną':"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2848,135 +3040,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr "Dołącz sekcję 'Tytuły'"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr "Dołącz sekcję 'Ostatnio dodane'"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr "Sortuj numery jako tekst"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr "Masowa konwersja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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 "Opcje specyficzne dla formatu wyjściowego."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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 "źródłowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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 "Liczba kolorów:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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 "Wyłącz normalizację"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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 "Zachowaj &proporcje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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 "Wyłącz wyostrzanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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 "Nie &przycinaj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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 "&Szerokość"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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 "Pozioma"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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 "Od &prawej do lewej"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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 "Nie sor&tuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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 "&Odpalmiacz"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr "&Wyłącz przetwarzanie komiksów"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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 "Format w&yjściowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101
 msgid "Disable conversion of images to &black and white"
 msgstr "Wyłącz konwersję grafik na &czarno-białe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr "Debugowanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr "Debuguj proces konwersji."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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 "Wybierz folder debugowania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr "Niewłaściwy folder debugowania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr "Nie udało się storzyć folderu debugowania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2984,105 +3176,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr "Wyjściowy EPUB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr "Brak domyślnej &okładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr "&Dziel pliki większe niż:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " KB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr "Źródłowy FB2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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 "Nie wstawiaj &spisu treści na początku książki."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr "Wyjściowy FB2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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 "Spis treści w jednej &linii"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -3098,506 +3250,506 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr "Dokument w&yjściowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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 "&Główny rozmiar czcionki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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 "&Klucz rozmiaru czcionki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pkt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr "Uzyj &domuślnych wartośći"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr "Dokument ź&ródłowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr "&Rozmiar czcionki: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr " będzie odpowiadać rozmiarowi: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr "0,0 pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr "Wygląd i zachowanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18
 msgid "Control the look and feel of the output"
 msgstr "Kontroluj wygląd i zachowanie pliku wyjściowego"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr "Nie &skaluj rozmiaru czcionek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr "Główny &rozmiar czcionki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr "Wysokość &linii:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr "&Kodowanie znaków w pliku źródłowym:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr "Usuń &odstępy pomiędzy paragrafami"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr "Rozmiar wcięcia:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr " em"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr "&Przekształcaj tabele na tekst"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr "Dodatkowa stylizacja kodem &CSS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr "Wstaw &pustą linię"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr "Wyjściowy LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr "Pozwól &automatycznie obracać szerokie grafiki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr "Minimalne wcięcie paragrafu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr "Renderuj &tabele jako grafiki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr "Dodaj &nagłówek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr "&Odzielenie nagłówka:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr "&Format nagłówka:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr "&Zagnieżdżone czcionki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr "Rodzina czcionki &szeryfowej:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr "Rodzina czcionki o &jednakowej szerokości znaków:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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 "Metadane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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 "Wybierz okładkę dla "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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 "Nie można odczytać"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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 "Nie masz uprawnień do odczytu pliku: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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 "Błąd przy odczycie pliku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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>Wystąpił błąd podczas odczytu z pliku: <br /><b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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 " nie jest poprawnym formatem grafiki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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 "Okładka książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr "Użyj okładki z pliku ź&ródłowego"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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 "Zmień grafikę &okładki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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 "Wybierz obraz, który będzie użyty jako okładka tej książki."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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 "&Tytuł: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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 "Zmień tytuł tej ksiązki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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 "&Autor(rzy): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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 "&Wydawca: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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 "E&tykiety: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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 "&Serie:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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 "Lista znanych serii. Możesz dodać nowe serie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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 "Książka "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr "Wyjściowy MOBI"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr "Domyślne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr "&Tytuł dla spisu treści:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr "Przeskaluj grafiki dla urządzeń &Palm"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr "Wyłącz kompresję zawartości pliku."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:71
 msgid "Do not add Table of Contents to book"
 msgstr "Nie dodawaj spisu treści do ksiązki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr "Opcje Kindle"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "Ustawienia strony"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr "Profil &wyjściowy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "Opis profilu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr "Profil źródłowy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr "Marginesy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr "&Lewy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr "&Górny:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr "&Prawy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr "&Dolny:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr "Źródłowy PDB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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 "Traktuj każdą &linię jako paragraf"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr "Wyjściowy PDB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr "&Format:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr "Źródłowy PDF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr "Brak &grafik"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr "Wyjściowy PDF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr "Rozmiar &papieru:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr "&Orientacja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr "Wyjściowy RB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 "Wybierz format do wyświetlenia"
 
-#: /home/kovid/work/trunk/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 ""
 "Nie można uworzyć wyrażenia regularnego, używając konstruktora, bez książki."
 
-#: /home/kovid/work/trunk/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 "Brak dostępnych formatów"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr "Otwórz książkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr "Konstruktor wyrażeń regularnych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr "Podgląd"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr "Wyrażenie regularne:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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 "Test"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr "Konwersja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr "Opcje dotyczące formatu źródłowego."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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 "Okno dialogowe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr "Format ź&ródłowy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr "Uzyj &zapisanych ustawień konwersji dla pojedynczych książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
@@ -3605,72 +3757,72 @@ msgstr ""
 "Wykrywanie\n"
 "struktury"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr "Wstawiaj znaczniki końca strony przed (wyrażenie XPath):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr "Wyrażenie regularne dla nagłówka:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr "Wyrażenie regularne dla stopki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr "Niewłaściwe wyrażenie regularne: %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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 "Nieprawidłowe wyrażenie XPath"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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 "Wyrażenie XPath %s jest nieprawidłowe."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr "&Znacznik rozdziału:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr "Usuń pierwszą &grafikę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Insert &metadata as page at start of book"
 msgstr "Wstaw &metadane jako stronę na początku książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr "Usuń &stopkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr "Usuń &nagłówek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
@@ -3678,157 +3830,161 @@ msgstr ""
 "Spis\n"
 "treści"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18
 msgid "Control the creation/conversion of the Table of Contents."
 msgstr "Kontroluj tworzenie/konwersję spisu treści"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr "Pierwszy poziom spisu treści (wyrażenie XPath):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr "Drugi poziom spisu treści (wyrażenie XPath):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr "Trzeci poziom spisu treści (wyrażenie XPath):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Nie dodawaj &wykrytych rozdziałów do spisu treści"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Liczba &linków do dodania do spisu tresci"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "&Wstęp do rozdziału"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Wymuś użycie wygenerowanego automatycznie spisu treści"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "Filtr spisu treści:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr "Źródłowy TXT"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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 "Wyjściowy TXT"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr "Styl zakończenia &linii:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr "&Maksymalna długość linii:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr "Wymuś maksymalną długość linii"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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 "Etykieta tekstowa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
 msgid "Use a wizard to help construct the XPath expression"
 msgstr "Użyj kreatora pomagającego skonstruować wyrażenie XPath"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr "*"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr "a"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr "br"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr "div"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr "h1"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr "h2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr "h3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr "h4"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr "h5"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr "h6"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr "hr"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr "span"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr "Zawierające &atrybut:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr "O &wartości:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr "(wyrażenie regularne)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3838,330 +3994,391 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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 "Tak"
+
+#: /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 "Nie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Brak szczegółów."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr "Urządzenie zostało już odłączone."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr "Pobierz informacje o urządzeniach"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr "Pozyskaj listę książek na urządzeniu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr "Pobierz adnotacje  z urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr "Prześlij metadane do urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr "Prześlij %d książek na urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr "Usuń książki na urządzeniu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr "Pobierz książki z urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr "Zobacz ksiązki na urządzeniu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "i usuń z biblioteki"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr "Ustaw domyślne działanie przesyłania na urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr "Prześlij emailem do"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr "Prześlij do głównej pamięci"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr "Prześlij na kartę pamięci A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr "Prześlij na kartę pamięci B"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-msgstr "Prześlij określony format na główna pamięć"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
-msgstr "Prześlij określony format na kartę pamięci A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
-msgstr "Prześlij określony format na kartę pamięci B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr "wybranych do wysłania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr "Wybierz format plików przesyłanych na urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr "Brak urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 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/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr "Brak karty"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr "Nie można przesłać: Urządzenie nie posiada karty pamięci"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "przez"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr "w formacie %s."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr "Wysyłanie wiadomości do"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr "Brak odpowiednich formatów"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 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/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 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/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr "Przesłanie książek na email nie powiodło się"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr "Przesłanie następujących książek poprzez email nie powiodło się:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr "Preślij poprzez email:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr "Aktualności:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr "Załączony jest"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr "Wysyłaj aktualności do"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 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/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr "Trwa wysyłanie katalogów do urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr "Przesyłanie aktualności na urządzenie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr "Wysyłanie książek do urządzenia."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr "Brak miejsca na urządzeniu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 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/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 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/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr "Uzywaj podkatalogów"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr "&Zapisz schemat:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "Ścieżka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "Formaty"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /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"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr "&Poprzednia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr "&Następna"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr "Moje książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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 "Wygeneruj katalog"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr "Wygeneruj katalog dla {0} książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr "&Format katalogu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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 ""
 "&Tytuł katalogu (istniejący katalog o tej samej nazwie zostanie nadpisany):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr "Automatycznie wyślij katalog do urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr "Opcje katalogu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "Wybierz format"
 
-#: /home/kovid/work/trunk/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 "Ustaw parametry domyślne konwersji komiksów (pliki CBR/CBZ)"
 
-#: /home/kovid/work/trunk/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 "Ustaw opcje dla konwersji %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr "&Tytuł:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr "&Autor(rzy):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr "&Profil:"
 
-#: /home/kovid/work/trunk/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 "%(plugins)s: %(plugin_type)s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
 msgstr "Wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
 "\n"
 "Customization: "
@@ -4169,23 +4386,23 @@ msgstr ""
 "\n"
 "Dostosowywanie: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
 msgstr "Konwersja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "General"
 msgstr "Ogólne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
 msgstr "Interfejs"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Add/Save"
 msgstr "Dodaj/zapisz"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
@@ -4193,11 +4410,11 @@ msgstr ""
 "Dostarczanie\n"
 "poczty email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
@@ -4205,170 +4422,197 @@ msgstr ""
 "Serwer\n"
 "zawartości"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Auto send"
 msgstr "Wysyłaj automatycznie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr "E-mail"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "nowy adres email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "Błąd"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr "Nie powiodła się instalacja narzędzi linii poleceń."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Narzędzia linii poleceń zostały zainstalowane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr "Narzędzia linii poleceń zostały zainstalowane w"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "Niewłaściwa ścieżka do wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s nie jest właściwą ścieżką do wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Wybierz wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Wtyczka nie może zostać wyłączona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "Wtyczka %s nie może zostać wyłączona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Tej wtyczki nie można dostosowywać"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "Wtyczka %s nie potrzebuje dodatkowego dostosowywania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Dostosuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Nie można usunąć wbudowanej wtyczki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "Dziennik błędów:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Dziennik dostępów:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "Włączanie serwera zakończone niepowodzeniem"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /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/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Niewłaściwy rozmiar"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "Niewłaściwa lokalizacja bazy danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "Niewłaściwa lokalizacja bazy danych "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Musi być katalogiem."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Niewłaściwa lokalizacja bazy danych.<br>Nie można zapisać do "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr "Sprawdzanie integralności bazy danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "Sprawdzenie integralności bazy danych się nie powiodło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4376,22 +4620,22 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:105
 msgid "Read metadata only from &file name"
 msgstr "Odczytaj metadane jedynie z &nazwy pliku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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."
@@ -4399,11 +4643,11 @@ msgstr ""
 "Zamień pozycjami imię i nazwisko autora. To ma wpływ jedynie na metadane "
 "odczytywane z nazw plików."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr "&Zamień pozycjami imię i nazwisko"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4414,81 +4658,81 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr "&Konfiguruj metadane pobierane z nazwy pliku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr "&Dodawanie książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr "Zapisuj &okładki osobno"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr "Uaktualnij &metadane w zapisanych kopiach"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr "Zapisz metadane w pliku &OPF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:119
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 "Zamieniaj znaki nie w języku angielskiem na ich &angielskie odpowiedniki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr "Formatuj &daty według schematu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr "&Formaty pliku do zapisu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr "Zastąp spacje &podkreślnikami"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr "Zmieniaj ścieżki na &małe litery"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr "&Zapisywanie książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr "Przesyłanie na &urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -4496,180 +4740,196 @@ 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr "Wybierz nową lokalizację bazy danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr "Pokaż powiadomienie, gdy &nowa wersja jest dostępna"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Pobieraj domyślnie metadane &społecznościowe (etykiety/oceny/itd.)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "Domyślnie &nadpisuj autora i tytuł przy pobieraniu metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr "Domyślny sieciowy &czas oczekiwania:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr "Wybierz &język (wymaga restartu):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "Normalny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr "Wysoki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr "Niski"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr "&Priorytet zdań:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr "Preferowany format &docelowy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr "Preferowany porządek formatów &źródłowych:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr "Używaj numeracji &rzymskiej do numerowania serii"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Aktywuj ikonę w &zasobniku systemowym (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr "Pokaż &powiadomienia w zasobniku systemowym"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 "Pokaż &przeglądarkę okładek w nowym oknie (wymaga restartu)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "Szukaj w trakcie wpisywania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automatycznie przesyłaj pobrane &aktualności na czytnik e-książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr "Duże"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr "Średnie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr "Małe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr "&Rozmiar przycisków na pasku narzędzi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr "Pokazuj &tekst pod przyciskami na pasku narzędzi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr "Wybierz &kolumny wyświetlane w widoku biblioteki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Użyj &wewnętrzej przeglądarki dla:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "&Dodaj email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr "&Ustaw jako domyślny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr "&Usuń email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr "&Sprawdź integralność bazy danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr "Za&instaluj narzędzia linii komend"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr "Otwórz katalog &konfiguracyjny calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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 "
@@ -4679,25 +4939,25 @@ msgstr ""
 "pomocą przeglądarki z dowolnego miejsca na świecie. Jakiekolwiek zmiany w "
 "ustawieniach zostaną zatwierdzone po ponownym uruchomieniu serwera."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "&Port serwera"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -4705,48 +4965,48 @@ 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "Maks. rozmiar &okładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "&Włącz serwer"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr "W&yłącz serwer"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr "&Testuj serwer"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr "Uruchom serwer &automatycznie przy starcie aplikacji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "Pokaż dziennik &serwera"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4762,7 +5022,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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -4770,115 +5030,228 @@ msgstr ""
 "Tutaj można dostosować zachowanie Calibre poprzez kontrolę wtyczek, których "
 "ma używać."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Włącz/&Wyłącz wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr "&Dostosuj wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr "&Usuń wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr "Dodaj nową wtyczkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr "&Plik wtyczki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr "Nagłówek kolumny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr "Typ kolumny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr "Użyj nawiasów"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr "Wartości mogą być edytowane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr "Tak"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr "Nie"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr "Tekst"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr "Liczba"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr "Kopiuj do &schowka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr "Niewłaściwy szablon"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr "Szablon %s jest nieprawidłowy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr "Zapisz &szablon"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4887,70 +5260,66 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr "Dostępne zmienne:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr "Pobieranie szpołecznościowych metadanych, proszę czekać..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "Na pewno?"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr "&Zawsze pokazuj to ostrzeżenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "BŁĄD"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr "Wyszukuję metadane..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr "Nie można było znaleźć metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:180
 msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 "Pobieranie metadanych wydaje się przedłużać. Spróbuj ponownie później."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr "Nie udało się pobrać metadanych z:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr "Nie znaleziono metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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 ""
 "Nie odnaleziono metadanych. Spróbuj poprawić tytuł i autora albo numer ISBN."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr "Pobierz metadane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4962,132 +5331,127 @@ msgstr ""
 "musisz <a href=\"http://www.isbndb.com\">zarejestrować się</a> i wpisać "
 "poniżej swój klucz dostępu."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr "Klucz &dostepu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr "Pobierz"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr "Pasujące"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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 ""
 "Wybierz książkę, która najdokładniej pasuje do Twojej kopii, z listy poniżej"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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 ""
 "Pobierz metadane społecznościowe (etykiety/oceny/itd.) dla zaznaczonej "
 "książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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 ""
 "Nadpisz autora i tytuł danymi odnośnie autora i tytułu z zaznaczonej książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr "Szczegóły zadania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr "Aktywne zadanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr "&Zatrzymaj zaznaczone zadanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr "Pokaż &szczegóły zadania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr "&Zatrzymaj wszystkie zadania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:22
-msgid "Editing meta information for %d books"
-msgstr "Edytowanie metadanych dla %d książek"
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "Edytuj metadane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "Metadane"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr "A&utomatycznie sortuj według autora"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr "S&ortowanie według autora: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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 "&Ocena:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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 "Ocena tej książki. 0-5 gwiazdek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr "Bez zmian"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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 " gwiazdek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr "Dodaj t&agi: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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 "Otwórz edytor etykiet"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr "&Usuń etykiety:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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 "Lista oddzielonych przecinkami tagów do usunięcia z książki. "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr "Usuń &format:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr "Zamień tytuł i autora"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -5095,366 +5459,424 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr "Automatycznie numeruj książki w serii"
 
-#: /home/kovid/work/trunk/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 "To nie jest działający obrazek"
 
-#: /home/kovid/work/trunk/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 "Wybierz formaty dla "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "Książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
 msgid "No permission"
 msgstr "Brak uprawnień"
 
-#: /home/kovid/work/trunk/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 "Nie masz uprawnień do odczytu następujących plików:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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 "Nie wybrano formatu"
 
-#: /home/kovid/work/trunk/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 "Nie można odczytać metadanych"
 
-#: /home/kovid/work/trunk/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 "Nie można odczytać metadanych z formatu %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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 "Nie udało się odczytać okładki"
 
-#: /home/kovid/work/trunk/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 "Nie można odczytać okładki z formatu %s"
 
-#: /home/kovid/work/trunk/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 "Okładka w formacie %s jest nieprawidłowa"
 
-#: /home/kovid/work/trunk/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 "Przerwij edycję wszystkich pozostałych książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr "Numer ISBN jest poprawny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr "Numer ISBN nie jest poprawny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr "Pobieranie okładki..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr "Nie można pobrać okładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Nie można pobrać okładki.</b><br/>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr "Czas pobierania minął."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 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/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "Zła okładka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr "Ta okładka nie jest działającym obrazkiem"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr "Pojawiły się błędy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr "Wystepiły błędy podczas pobierania społecznościowych metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr "Nie można pobrać metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 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/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr "Brak dostępu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 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 "
 "program?"
 
-#: /home/kovid/work/trunk/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 "Edytuj metadane"
 
-#: /home/kovid/work/trunk/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 "Metadane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Swap the author and title"
 msgstr "Zamień autora z tytułem"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 ""
 "Usuń nieużywane serie (serie, które są nie przypisane do żadnej książki)"
 
-#: /home/kovid/work/trunk/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/trunk/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 "Wy&dana:"
 
-#: /home/kovid/work/trunk/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 "dd MMM rrrr"
 
-#: /home/kovid/work/trunk/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 "&Data:"
 
-#: /home/kovid/work/trunk/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 "&Komentarze"
 
-#: /home/kovid/work/trunk/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 "&Pobierz metadane z serwera"
 
-#: /home/kovid/work/trunk/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 "Dostępne formaty"
 
-#: /home/kovid/work/trunk/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 "Dodaj nowy format tej książki do bazy danych."
 
-#: /home/kovid/work/trunk/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 "Usuń zaznaczone formaty tej ksiązki z bazy danych."
 
-#: /home/kovid/work/trunk/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 "Przypisz okładkę dla tej książki z wybranego formatu"
 
-#: /home/kovid/work/trunk/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 "Uaktualnij metadane pobierając je z metadanych wybranego formatu"
 
-#: /home/kovid/work/trunk/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 "Przywróć domyślną okładkę"
 
-#: /home/kovid/work/trunk/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 "Pobierz o&kładkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr "Wymagane hasło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr "Przerywanie..."
 
-#: /home/kovid/work/trunk/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 "Potrzebna jest nazwa użytkownika oraz hasło"
 
-#: /home/kovid/work/trunk/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 ""
 "Musisz podać nazwę użytkownik i/lub hasło, aby móc korzystać z tego źródła "
 "aktualności."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
 msgid "Created by: "
 msgstr "Stworzone przez: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:178
 msgid "Last downloaded: never"
 msgstr "Ostatnio pobrano: nigdy"
 
-#: /home/kovid/work/trunk/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 "%d dni, %d godzin i %d minut temu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
 msgid "Last downloaded"
 msgstr "Ostatnio pobrano"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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 "Zaplanuj pobieranie aktualności"
 
-#: /home/kovid/work/trunk/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 "Dodaj własne źródło aktualności"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
 msgid "No internet connection"
 msgstr "Brak połączenia z internetem"
 
-#: /home/kovid/work/trunk/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 ""
 "Nie można pobrac żadnych aktualności dopóki żadne połączenie internetowe nie "
 "jest aktywne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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 "Źródła"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr "Pobierz wszystkie zaplanowane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr "Pobierz &wszystkie zaplanowane aktualności"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr "&Zaplanuj do pobrania:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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 "Co "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "dzień"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "poniedziałek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "wtorek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "środę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "czwartek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "piątek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "sobotę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "niedzielę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr "o"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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 " dni"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr "&Konto"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 "Aby zaplanowane działania były wykonywane, musisz zostawić włączone calibre."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr "&Planowanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr "Dodaj &tytuł jako etykietę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr "&Dodatkowe etykiety:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr "Z&aawansowane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr "&Pobierz teraz"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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."
@@ -5462,20 +5884,20 @@ msgstr ""
 "Usuń pobrane aktualności starsze niż podana liczba dni. Ustaw zero, aby "
 "wyłączyć usuwanie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr "Usuń pobrane aktualności starsze niż "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "zawiera"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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 ""
 "Tekst, którego szukasz. Jest on interpretowany jako wyrażenie regularne."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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."
@@ -5483,62 +5905,62 @@ msgstr ""
 "<p>Zaneguj to wyszukiwanie. Wynikami będą książki, które <b>nie</b> pasują "
 "do tekstu wyszukiwania."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr "Zaneguj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr "Znajdź wpisy zawierające..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr "&Wszystkie te słowa:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr "Dokładnie tą &frazę:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr "&Jedno lub więcej z tych słów:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr "Ale nie pokazuj wpisów zawierających..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr "Którekolwiek z &niechcianych słów:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr "Jaki rodzaj porównywania ma być używany:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:121
 msgid "Contains: the word or phrase matches anywhere in the metadata"
 msgstr "Zawieranie: słowo lub fraza występuje gdziekolwiek w metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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 ""
 "Równość: słowo lub fraza musi w całości pasować do wpisu w metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:123
 msgid ""
 "Regular expression: the expression must match anywhere in the metadata"
 msgstr ""
 "Wyrażenie regularne: wyrażenie musi pasować gdziekolwiek w metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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"
@@ -5546,15 +5968,83 @@ msgstr ""
 "Zerknij do <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-"
 "search-interface\">Podręcznika Użytkownika</a> aby uzyskać więcej informacji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr "Wybierz formaty"
 
-#: /home/kovid/work/trunk/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:72
+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
+msgid "Publishers"
+msgstr "Wydawcy"
+
+#: /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 "Jesteś pewien?"
 
-#: /home/kovid/work/trunk/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?"
@@ -5562,15 +6052,15 @@ msgstr ""
 "Następujące etykiety są przypisane do jednej lub więcej książek. Czy jesteś "
 "pewien, że chcesz je usunąć?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "Edytor etykiet"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "&Dostępne etykiety"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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."
@@ -5578,157 +6068,217 @@ msgstr ""
 "Usuń etykietę z bazy danych. To działanie usunie tą etykietę ze wszystkich "
 "książek i usunie ją z bazy danych."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr "Przypisz etykietę do tej książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr "&Przypisane etykiety"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr "Usuń etykietę z tej książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr "Dodaj etykietę:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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 "Dodaj etykietę do dostępnych etykiet i przypisz ją do tej książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "Testuj ustawienia email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr "Wyślij testowy email z %s na:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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 "&Test"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr "Nie zaznaczono źródła"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
 msgid "The attached file: %s is a recipe to download %s."
 msgstr "Załączony plik: %s jest źródłem do pobrania %s."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr "Źródło dla "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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 "Przełącz na tryb zaawansowany"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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 "Przełącz na tryb podstawowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr "Strumień musi mieć tytuł"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr "Strumień musi mieć tytuł"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr "Strumień musi poisadać adres URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr "Strumień %s musi poisadać adres URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr "Już istnieje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:186
 msgid "This feed has already been added to the recipe"
 msgstr "Ten strumień został już dodany do"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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 "Niepoprawne dane wejściowe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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>Nie można było stworzyć źródła. Błąd:<br>%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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 "Zastąpić źródłó?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr "Wybierz źródło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr "Wybierz źródło, które chcesz dostosować"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr "Wybierz plik źródła"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr "Dodaj własne źródło aktualności"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr "Dostępne źródła użytkownika"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr "Dodaj/Uaktualnij ź&ródło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr "&Usuń źródło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr "&Przekaż źródło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr "Dostosuj jedno z &domyślnych źródeł"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr "&Wczytaj źródło z pliku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5742,52 +6292,52 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr "&Tytuł źródła:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr "&Najstarszy artykuł może mieć:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr "Najstarszy artykuł do pobrania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr "&Maksymalna ilość artykułów na strumień:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265
 msgid "Maximum number of articles to download per feed."
 msgstr "Maksymalna liczba artykułów do pobrania na strumień."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr "Strumienie w źródle aktualności"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr "Usuń strumień ze źródła"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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 "Dodaj strumień do źródła"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr "&Tytuł strumienia:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr "Adres &URL strumienia:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr "&Dodaj strumień"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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>"
@@ -5796,11 +6346,11 @@ msgstr ""
 "<a href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">źródła "
 "aktualności użytkownika</a>."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr "Kod źródłowy źródła aktualności (python)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5824,648 +6374,793 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr "Wyrażenie &regularne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr "&Nazwa pliku:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Wyrażenie regularne (?P&lt;title&gt;)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr "Brak wyników"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr "Autorzy:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr "Wyrażenie regularne (?P<autor>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr "Serie:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr "Wyrażenie regularne (?P<seria>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr "Spis serii:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr "Wyrażenie regularne (?P<indeks_serii>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr "Wyrażenie regularne (?P<isbn>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr "Zadanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "Status"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "Postęp"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr "Czas pracy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr "Aktualnie jest przetwarzanych %d zadań:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr "Nieznane zadanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr "Aktualnie jest %d zadań oczekujących:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr "Nie można zatrzymać zadania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 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/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr "Zadanie zostało już wykonane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr "Niedostępne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr " - Zadania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "Rozmiar (MB)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "Brak"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Książka <font face=\"serif\">%s</font> z %s."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /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
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+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
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Niedozwolone"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr "Kliknij dwa razy, aby rozpocząć <b>edycję</b><br><br>"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr "Konfiguruj przeglądarkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr "Uzyj białego tła"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr "Dziel wyrazy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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>Efekt zmian będzie widoczny dopiero po ponownym uruchomieniu.</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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>Nie znaleziono wyników</b> dla szukanej frazy <i>%s</i>."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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 "Brak pasujących wyników"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr "Przeglądarka LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr "Przetwarzam plik LFR"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr "Pasek narzędzi przeglądarki LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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 "Następna strona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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 "Poprzednia strona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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 "Wstecz"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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 "Do przodu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr "Następny pasujący"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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 "Otwórz e-book"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr "Ustawienia"
 
-#: /home/kovid/work/trunk/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 "Użyj biblioteki zlokalizowanej pod podaną ścieżką."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
 msgid "Start minimized to system tray."
 msgstr "Uruchom zminimalizowany w zasobniku systemowym."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
 msgstr "Zapisuj informacje z debugowania do konsoli"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr "Nie sprawdzaj czy uaktualnienie jest dostępne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 "Biblioteka calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Zła lokalizacja bazy danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr "Jeśli jestes pewien, że nie jest uruchomione"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "Nie można uruchomić "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s jest już uruchomiony."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr "może być uruchomione i znajdować się w zasobniku systemowym"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr "w prawym górnym obszarze wyświetlacza."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr "w prawym donym obszarze wyświetlacza."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "spróbuj zrestartować komputer."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "spróbuj usunąć plik"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr "usraw w ui.py"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "&Szukaj:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr "usraw w ui.py"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr "Wyczyść pasek wyszukiwania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 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/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr "Skopiuj aktualny tekst wyszukiwania (zamiast nazwy wyszukiwania)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr "Zapisz aktualne wyszukiwanie pod nazwą pokazaną w polu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr "Usuń aktualne, zapisane wyszukiwanie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "Sortuj według &popularności"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr "Dopasuj którykolwiek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr "Dopasuj wszystkie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "Dodaj książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "Usuń książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Usuń"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "Edytuj metadane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr "S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "Prześlij na urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "Zapisz na dysku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "Pobierz aktualności"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "Konwertuj ksiązki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Wyświetl"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "Otwórz folder zawierający"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "Pokaż szczegóły ksiązki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "Książki tego samego autora"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "Książki z tej serii"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr "Książki tego samego wydawcy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "Książki z takimi samymi etykietami"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr "Konfiguruj calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr "&Ustawienia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr "&Zakończ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr "BŁĄD: Nieobsłuzony wyjątek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr "Książka nie ma, ani tytułu, ani kodu ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr "Nie znaleziono wyników dla tej książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "Szukaj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "Wciśnij dowolny klawisz..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr "Jest juz przypisany"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr "jest już przypisany do"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid " or "
 msgstr " lub "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
 msgid "&Default"
 msgstr "&Domyślnie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr "Dostosuj skrót dla"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr "Klawisze"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr "Kliknij dwa razy any zmienić"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr "Ramka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr "&Użytkownika"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr "&Skrót:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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 "Kliknij, by zmienić"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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 "Wyczyść"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr "&Alternatywny skrót:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr "Zadań:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /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/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
-msgstr "Kliknij, aby przeglądać książki po okładkach"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr "Kliknij aby wyłączyć Przeglądanie Okładek"
-
-#: /home/kovid/work/trunk/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/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
-"<p>Przeglądanie książek za pomocą ich okładek jest wyłączone.<br>Załadowanie "
-"modułu pictureflow nie powiodło się:<br>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
-msgstr "Kliknij, aby przeglądać ksiązki po etykietach"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "Autorzy"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Hide Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "Wydawcy"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Wyszukiwania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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 "Konwertuję %d książkę z %d (%s)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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 "Nie można było przekonwertować niektórych książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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."
@@ -6473,23 +7168,23 @@ msgstr ""
 "Nie można było skonwertować %d książki z %d, ponieważ nie udało się znaleźć "
 "odpowiedniego formatu źródłowego."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr "Kolejkowanie książek do masowej konwersji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "Kolejnkowanie "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr "Pobieranie aktualności z "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr "Okładka istnieje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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?"
@@ -6497,86 +7192,86 @@ msgstr ""
 "Następujące książki zostały już skonwertowane do formatu %s. Czy chcesz, by "
 "zostały ponownie skonwertowane?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:67
+#: /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/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr "Zachowane wyszukiwania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /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/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Przywróć"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "&Wpłać i wesprzyj rozwój calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "&Odłącz połączone urządzenie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Uruchom ponownie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr "Edytuj metadane pojedynczo"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr "Edytuj metadane masowo"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr "Pobierz metadane i okładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr "Pobierz tylko metadane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr "Pobierz tylko okładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /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/trunk/src/calibre/gui2/ui.py:284
+#: /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/trunk/src/calibre/gui2/ui.py:286
+#: /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/trunk/src/calibre/gui2/ui.py:293
+#: /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/trunk/src/calibre/gui2/ui.py:294
+#: /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)"
@@ -6584,7 +7279,7 @@ 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/trunk/src/calibre/gui2/ui.py:297
+#: /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)"
@@ -6592,93 +7287,105 @@ 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/trunk/src/calibre/gui2/ui.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:348
+#: /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/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 "Zapisz na dysku jedynie pliki w formacie %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr "Wyświetl określony format"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr "Usuń wybrane książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /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/trunk/src/calibre/gui2/ui.py:367
+#: /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/trunk/src/calibre/gui2/ui.py:369
+#: /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/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr "Konwertuj pojedynczo"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr "Masowa konwersja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /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/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr "Uruchom kreator wstępnych ustawień"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr "Podobne książki..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Krótki przewodnik po calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Przeglądaj po okładkach"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "(wszystkie książki)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
-msgstr "(znaleziono %d)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Urządzenie: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " wykryte"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Połączone "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "Baza danych urządzenia uszkodzona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6694,148 +7401,148 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 "Użyj tylko biblioteki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 "Użyj tylko adnotacji wygenerowanych na podstawie biblioteki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 "Nie wybrano ksiązek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr "%s<br />Ostatnio czytana strona: %d (%d%%)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr "%s<br />Ostatnio czytana strona: Lokalizacja %d (%d%%)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr "<b>Lokalizacja %d &bull; %s</b><br />%s<br />"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr "<b>Strona %d &bull; %s</b><br />"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr "<b>Lokalizacja %d &bull; %s</b><br />"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "Jak wiele pustych książek?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr "Jak wiele pustych książek powinno zostać dodanych?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 "Przesyłam książki na urządzenie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "Książki EPUB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "Książki LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "Książki HTML"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "Książki LIT"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "Książki MOBI"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Książki tekstowe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "Książki PDF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Komiksy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Archiwa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "Wspierane książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "Scal niektóre książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Nie można było odczytać metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr "Nie można było odczytać metadanych z nastepujących"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "Usunięcie niemożliwe."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 "Nie wybrano ksiązki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "Wybierz formaty do usunięcia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Wybierz formaty, które <b>nie</b> zostaną usunięte"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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?"
@@ -6843,57 +7550,63 @@ 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/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Usuwanie książek z urządzenia."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Nie można obrac metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "metadane społecznościowe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "okładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metadane"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Pobieram %s dla %d książki(ek)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Nie udało się pobrać niektórych metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 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/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Nie udało się pobrać metadanych:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 "Nie można edytować metadanych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 "Nie można połączyć książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 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/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6901,7 +7614,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6911,7 +7624,7 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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?"
@@ -6919,87 +7632,83 @@ msgstr ""
 "Chcesz połączyć więcej niż 5 książek. Jesteś <b>pewien</b>, że chcesz "
 "kontynuować?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Nie można zapisać na dysku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Wyberz folder docelowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Błąd podczas zapisywania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "Wysapił błąd podczas zapisywania."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 "Nie można była zapisać niektórych książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr "Kliknij \"Pokaż szczegóły\", aby zobaczyć które."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr "Brak książek do wygenerowania katalogu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "Generowanie katalogu %s..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "Katalog wygenerowany"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "Eksportuj folder katalogu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "Wybierz folder docelowy dla %s.%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Pobieranie aktualności z "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " - pobrano."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Nie można przekonwertować"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr "Rozpoczynam konwersję %d książki(ek)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "Nie można wyświetlić"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr "Nie można otworzyć folderu"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Wybrano wiele książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -7007,31 +7716,44 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr "Nie można otworzyć folderu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s nie ma dostępnych formatów."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Nie można konfigurować"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr "Nie można konfigurować programu, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Brak szczegółowych informacji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Błąd komunikacji z urządzeniem"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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."
@@ -7039,12 +7761,12 @@ msgstr ""
 "Wystąpił chwilowy błąd komunikacji z urządzeniem. Odłącz i podłącz je "
 "ponownie lub uruchom komputer ponownie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -7053,26 +7775,26 @@ msgstr ""
 "href=\"%s\">DRM</a>. Musisz najpierw usunąć to zabezpieczenie przy pomocy "
 "innego programu."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Źródło wyłączone"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Nie powiodło się</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7082,11 +7804,11 @@ msgstr ""
 "                      Wyjście może spowodować uszkodzenie urządzenia.<br>\n"
 "                      Jesteś pewny, że chcesz wyjść?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "OSTRZEŻENIE: Aktywne zadania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -7094,7 +7816,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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -7102,11 +7824,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Najnowsza wersja: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Uaktualnienia dostępne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -7115,169 +7837,169 @@ msgstr ""
 "ebook.com/whats-new\">nowe funkcjonalności</a>. Przejść teraz na stronę "
 "pobierania?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr "Edytuj zakładkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr "Nowy tytuł dla zakładki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr "Eksport zakładek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr "Zapisane zakładki (*.pickle)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr "Import zakładek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr "Nazwa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr "Menadżer zakładek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr "Działania"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr "Edycja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr "Usuń"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr "Zresetuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr "Eksportuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr "Importuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr "Konfiguruj przeglądarkę książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr "&Opcje czcionki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr "Rodzina czcionek sze&ryfowych:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr "Rodzina czcionek &sans:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr "Rodzina czcionek o s&tałej szerokości:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr "&Domyślny rozmiar czcionki:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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 " px"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr "&Rozmiar czcionki o stałej szerokości:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr "Czcionka pods&tawowa:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr "Szeryfowa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr "Sans-serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr "Maszynowa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr "Zapamiętaj ostatnio używany rozmiar &okienka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr "Maksymalna &szerokość okienka:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170
 msgid "H&yphenate (break line in the middle of large words)"
 msgstr "Wykorzystaj łą&cznik (przełamuj linię w połowie długich słów)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
 msgstr "&Skaluj grafiki większe niż okno przeglądarki (wymaga restartu)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr "Arkusze stylów użytkownika"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr "O&gólne"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr "Kliknij dwa razy, by zmienić skrót klawiszowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr "Skróty &klawiszowe"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr "Nie znaleziono wyników dla:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr "Opcje odpowiedzialne za personalizacje przeglądarki książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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 "Zapamiętaj ostatnio użyty rozmiar okienka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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."
@@ -7285,310 +8007,310 @@ msgstr ""
 "Ustaw arkusz CSS użytkownika. Ta opcja może być użyta do spersonalizowania "
 "wyglądu wszystkich książek."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr "Maksymalny rozmiar okienka przeglądarki w pikselach."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
 msgid "Resize images larger than the viewer window to fit inside it"
 msgstr ""
 "Zmień rozmiar grafik większych niż okno przeglądarki, aby mieściły się one w "
 "nim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr "Tekst łącznika"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr "Opcje czcionki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr "Rodzina czcionek szeryfowych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr "Rodzina czcionek sans-serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr "Rodzina czcionek o stałej szerokości"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr "Standardowy rozmiar czcionki w pikselach"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr "Rozmiar czcionki o stałej szerokości znaków w pikselach"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr "Standardowy typ czcionki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr "Sprawdź w słowniku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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 "Przejdź do..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr "Następna sekcja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr "Poprzednia sekcja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr "Początek dokumentu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr "Koniec dokumentu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr "Początek sekcji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr "Koniec sekcji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr "Przewiń do następnej strony"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr "Przewiń do poprzedniej strony"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr "Przewiń do następnej sekcji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr "Przewiń do poprzedniej sekcji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr "Przewiń do końca sekcji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr "Przewiń do początku sekcji"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr "Przewiń do końca dokumentu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr "Przewiń do początku dokumentu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr "Przewiń w dół"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr "Przewiń w górę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr "Przewiń w lewo"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr "Przewiń w prawo"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr "Format książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr "Pozycja w książce"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr "Szukanie tekstu w książce"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr "Podgląd wydruku"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Łączenie z dict.org by sprawdzić: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr "Wybierz e-book"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr "E-booki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr "Dodaj zakładkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr "Dodaj tytuł zakładki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr "Nie znalezniono wyników dla: %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr "Ładowanie książki..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr "Błąd DRM"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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>Ta książka jest chroniona przez <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr "Nie można otworzyć książki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr "Opcje odpowiadające za kontolę nad przeglądarką książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Print javascript alert and console messages to the console"
 msgstr "Wyświetlaj uwagi javascript'u i widomości konsolowe w konsoli"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr "Zamknij słownik"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr "pasek narzędzi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr "Następna strona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr "Poprzednia strona"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr "Większy rozmiar czcionki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr "Mniejszy rozmiar czcionki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr "Znajdź następną"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr "Kopiuj do schowka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr "Tryb odwołań"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr "Zakładka"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr "Przełącz na tryb pełnoekranowy"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr "Drukuj"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr "Wydrukuj e-książkę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr "Kopiuj grafikę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr "Wklej grafikę"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
@@ -7598,7 +8320,7 @@ msgstr ""
 "%d\n"
 "książek"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
@@ -7608,7 +8330,7 @@ msgstr ""
 "%s\n"
 "dostępny"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
@@ -7618,7 +8340,7 @@ msgstr ""
 "%s\n"
 "dostępna"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
@@ -7628,108 +8350,112 @@ msgstr ""
 "%s\n"
 "dostępna"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr "Kliknij, aby zobaczyć książki dostępne na twoim komputerze"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 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/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 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/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 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/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr "Zmień wielkość liter"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr "Wielkie litery"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr "Małe litery"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr "Zamień wielkość liter"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr "Wielkość liter w tytule"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr "Przenoszenie biblioteki..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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 "Przeniesienie biblioteki się nie powiodło"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr "Nieprawidłowa baza danych"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr "Nie można przenieść biblioteki"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr "- kreator wstępnych ustawień"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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 "Witaj w calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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 ""
 "Jedyne takie rozwiązanie, przeznaczone dla wszystkich twoich e-książek."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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."
@@ -7737,22 +8463,15 @@ msgstr ""
 "Wybierz swój czytnik książek. Spowoduje to ustawienie opcji konwersji tak, "
 "by produkowały książki zoptymalizowane dla Twojego urządzenia."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr "&Producent"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr "&Urządzenia"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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."
@@ -7760,13 +8479,13 @@ msgstr ""
 "<h2>Gratulacje!</h2> Udało Ci się skonfigurować calibre. Naciśnij %s aby "
 "zastosować Twoje ustawienia."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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>."
@@ -7774,7 +8493,7 @@ msgstr ""
 "<h2>Podręcznik użytkownika</h2>Podręcznik użytkownika dostępny jest również "
 "<a href=\"http://calibre-ebook.com/user_manual\">w Internecie</a>."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7783,15 +8502,15 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr "Email &Kindle:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr "Wybierz &język:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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:"
@@ -7799,114 +8518,114 @@ msgstr ""
 "Wybierz lokalizację Twoich książek. Gdy dodasz książki do calibre, zostaną "
 "one tutaj skopiowane:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr "&Zmień"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
 msgstr "Używam: %s:%s@%s:%s i szyfrowania %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr "Wysyłanie..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr "Email wysłany pomyślnie"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr "Zakończ ustawianie konta GMail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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 "Zła konfiguracja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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 ""
 "Musisz ustawić nazwe uzytkownika i hasło dla tego serweru pocztowego."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr "Wyślij email &od:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr "&Serwer poczty"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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 może <b>opcjonalnie</b> użyć konkretnego serwera, aby przesyłać "
 "pocztę email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr "&Nazwa komputera:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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 "Nazwa hosta Twojego serwera poczty, np. smtp.gmail.com"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr "&Port:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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 ""
 "Port, na którym Twój serwer poczty nasłuchuje połączeń. Domyślnie to 25"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr "Twoja nazwa użytkownika na serwerze pocztowym"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr "Twoje hasło na serwerze pocztowym"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr "&Pokaż"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr "&Szyfrowanie:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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."
@@ -7914,27 +8633,27 @@ msgstr ""
 "Użyj szyfrowania TLS podczas podłączania do serwera poczty. To najczęstsze "
 "ustawienie."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr "&TLS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
 msgid "Use SSL encryption when connecting to the mail server."
 msgstr "Użyj szyfrowania SSL podczas podłączania do serwera poczty."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr "&SSL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr "Użyj poczty Gmail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr "&Testowy email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7942,45 +8661,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr "Włącz serwer &zawartości"
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
-msgstr "Ustawienia do kontroli serwera zawartości calibre"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
-msgstr "Port, na którym będziemy nasłuchiwać. Domyślnie to %default"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
-msgstr "Czas oczekiwania serwera w sekundach. Domyslnie %default"
-
-#: /home/kovid/work/trunk/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:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
-msgstr "Maksymalny rozmiar wyświetlanych okładek. Domyślnie %default."
-
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7989,7 +8719,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7997,14 +8727,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -8013,14 +8743,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8029,28 +8759,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8059,7 +8789,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -8069,27 +8799,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8098,56 +8828,49 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:232
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
 msgid "Sort results in ascending order"
 msgstr "Posortuj wyniki rosnąco"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "Znak używany do oddzielania pól. Domyslny to spacja."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr ""
-"Format, w którym będą dane wyjściowe. Do wyboru są: %s. Domyślny to tekst."
-
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
 msgstr "Niewłaściwe pola. Dostepne pola:"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:270
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
 msgstr "Niewłaściwe pole sortowania. Dostepnę pola:"
 
-#: /home/kovid/work/trunk/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):"
@@ -8155,7 +8878,7 @@ msgstr ""
 "Następujące książki nie zostały dodane ponieważ istnieją ją one w bazie "
 "danych (zobacz opcję --duplicates):"
 
-#: /home/kovid/work/trunk/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"
@@ -8164,17 +8887,17 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr "Przetwarzaj katalogi rekursywnie"
 
-#: /home/kovid/work/trunk/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."
@@ -8182,27 +8905,27 @@ msgstr ""
 "Dodaj książki do bazy danych nawet jeśli już są w niej. Porównanie odbywa "
 "się na podstawie tytułów."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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 "Wpisz ISBN dla dodanej pustej książki"
 
-#: /home/kovid/work/trunk/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 "Musisz określić conajmniej jeden plik do dodania"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8211,11 +8934,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Wybierz co najmniej jedną książkę do usunięcia"
 
-#: /home/kovid/work/trunk/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"
@@ -8224,15 +8947,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Musisz podać identyfikator i plik książki"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:481
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:383
 msgid "ebook file must have an extension"
 msgstr "Plik e-książki musi mieć rozszerzenie"
 
-#: /home/kovid/work/trunk/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"
@@ -8242,11 +8965,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Musisz podać identyfikator i format książki"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8256,15 +8979,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr "Wydrukuj metadane w formacie OPF (XML)"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr "Musisz podać identyfikator"
 
-#: /home/kovid/work/trunk/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"
@@ -8277,11 +9000,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Musisz podać identyfikator i plik z metadanymi"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8292,27 +9015,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Eksportuj wszystkie książki w bazie, ignoruj listę identyfikatorów."
 
-#: /home/kovid/work/trunk/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 "Eksportuj książki do podanego katalogu. Domyślny to"
 
-#: /home/kovid/work/trunk/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 "Eksportuj wszystkie książki do pojedynczego katalogu"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -8323,23 +9046,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8350,31 +9073,31 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 "Pokazuj szczegółowową informację wyjściową. Przydatne przy debugowaniu."
 
-#: /home/kovid/work/trunk/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 "Błąd: musisz podać plik wyjściowy katalogu"
 
-#: /home/kovid/work/trunk/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"
@@ -8386,17 +9109,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "Błąd: Musisz określić identyfikator, nazwę i wartość pola"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8405,19 +9128,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:834
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:736
 msgid "Show details for each column."
 msgstr "Pokaż szczegóły dla każdej kolumny."
 
-#: /home/kovid/work/trunk/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 "Utracisz wszystkie dane z kolumny: %r. Jesteś pewien (y/n)? "
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr "t"
 
-#: /home/kovid/work/trunk/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"
@@ -8427,15 +9150,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:862
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:764
 msgid "Do not ask for confirmation"
 msgstr "Nie pytaj o potwierdzenie"
 
-#: /home/kovid/work/trunk/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 "Błąd: Musisz podać nagłówek kolumny"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8447,87 +9170,103 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Kopiowanie <b>%s</b>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Kompaktowanie bazy danych"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Sprawdzam integralność SQL..."
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Sprawdzam czy brakuje jakichś plików."
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr "Tytuł"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr "Autorzy"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr "Etykiety"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr "Seria"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr "Kod ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr "Wydawca"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr "Data"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr "Data publikacji"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr "Wewnętrzny identyfikator calibre"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr "Opcje dotyczące zapisu na dysku"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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."
@@ -8535,7 +9274,7 @@ msgstr ""
 "Normalnie calibre uaktualni metadane w zapisanych plikach tymi, które są w "
 "bibliotece calibre. Sprawia, że zapisywanie na dysku jest wolniejsze."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:57
+#: /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."
@@ -8543,7 +9282,7 @@ msgstr ""
 "Normalnie calibre zapisze metadane do osobnego pliku OPF obok właściwego "
 "pliku z e-bookiem."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:60
+#: /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)."
@@ -8551,7 +9290,7 @@ msgstr ""
 "Normalnie calibre zapisze okładkę do osobnego pliku obok właściwego pliku z "
 "e-bookiem."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:63
+#: /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."
@@ -8559,7 +9298,7 @@ msgstr ""
 "Lista oddzielonych przecinkami formatów do zapisania dla każdej książki. "
 "Domyślnie wszystkie dostępne książki są zapisywane."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8567,7 +9306,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8575,7 +9314,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8587,29 +9326,63 @@ msgstr ""
 "możesz doświadczyć błędów podczas zapisywania, w zależności od tego, jak "
 "dobrze Twój system plików radzi sobie z Unicode."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr "Przekształć scieżki na małe znaki."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr "Zastąp spacje podkreśleniami."
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr "Żądane formaty nie dostępne"
 
-#: /home/kovid/work/trunk/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 "Ustawienia do kontroli serwera zawartości calibre"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr "Port, na którym będziemy nasłuchiwać. Domyślnie to %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr "Czas oczekiwania serwera w sekundach. Domyslnie %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 ""
+
+#: /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 "Maksymalny rozmiar wyświetlanych okładek. Domyślnie %default."
+
+#: /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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr "Hasło do biblioteki calibre. Nazwa użytkownika to "
 
-#: /home/kovid/work/trunk/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
@@ -8619,217 +9392,261 @@ msgstr ""
 "\n"
 "Włącz serwer zawartości calibre."
 
-#: /home/kovid/work/trunk/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 ""
 "Ściezka do folderu biblioteki, który ma być uzywany w serwerze zawartości"
 
-#: /home/kovid/work/trunk/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 "Zapisz identyfikator procesu do określonego pliku"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr "%sUżycie%s: %s\n"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr "Stworzony przez "
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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 "Ścieżka do bazy danych, w której książki są zlokalizowane"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:652
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
 msgid "Pattern to guess metadata from filenames"
 msgstr "Szablony odgadywania metadanych z nazw plików"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr "Klucz dostępu do isbndb.com"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:656
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:676
 msgid "Default timeout for network operations (seconds)"
 msgstr "Domyślny czas oczekiwania dla operacji sieciowych (w sekundach)"
 
-#: /home/kovid/work/trunk/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 "Ścieżka do katalogu w którym przechowywana jest biblioteka książek"
 
-#: /home/kovid/work/trunk/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 "Język wyświetlania interfejsu użytkownika"
 
-#: /home/kovid/work/trunk/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 "Domyślny format wyjściowy dla konwersji książek"
 
-#: /home/kovid/work/trunk/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 "Uporządkowana lista preferowanych formatów źródłowych."
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:668
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:688
 msgid "Read metadata from files"
 msgstr "Wczytaj metadane z plików"
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 "Zamień miejscami imię i nazwisko autora, podczas odczytywania metadanych"
 
-#: /home/kovid/work/trunk/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 "Dodaj nowy format do istniejącego wpisu książki"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:678
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
 msgstr "Lista nazwanych zapisanych wyszukiwań"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:43
+#: /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 "Czekam..."
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr "Zatrzymano"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr "Zakończone"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr "Pracuję.."
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr "brazylijsko-portugalski"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr "angielski (Wielka Brytania)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr "chiński uproszczony"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr "chiński (Hong Kong)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr "chiński tradycyjny"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr "angielski"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr "Angielski (Australia)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr "Angielski (Nowa Zelandia)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr "Angielski (Kanada)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr "Angielski (Indie)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr "Angielski (Tajlandia)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr "Angielski (Cypr)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr "Angielski (Pakistan)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr "Angielski (Singapur)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr "angielski (Jemen)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr "angielski (Irlandia)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr "hiszpański (Paragwaj)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr "Niemiecki (Austria)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr "Niderlandzki (Holandia)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr "Niderlandzi (Belgia)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr "adres hosta musi wyglądać następująco: użytkownik@nazwahosta"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr "Nie udało się wynegocjować sesji SSH: "
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr "Nie mozna było uwierzytelnić z serwerem: %s"
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr "Kontroluj dostarczanie poczty email"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr "Nieznany strumień"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "Artukył bez tytułu"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr "Pobieraj okresową zawartość z internetu"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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."
@@ -8838,131 +9655,131 @@ msgstr ""
 "\"max_articles_per_feed\" przyjęło wartość 2 i źródło pobierało co najwyżej "
 "2 strumienie."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:39
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:39
 msgid "Username for sites that require a login to access content."
 msgstr "Login dla stron wymagających zalogowania to przeglądania zawartości."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:42
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:42
 msgid "Password for sites that require a login to access content."
 msgstr "Hasło dla stron wymagających zalogowania to przeglądania zawartości."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr "Nieznane źródło informacji"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Pobranie zakończone"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "Nie udało się pobrać następujących artykułów:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " z "
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tNieprawidłowe linki:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Pobieram strumienie..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "Pobierz strumienie ze strony głównej"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Próbuję pobrać okładkę..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Rozpoczynam pobieranie [%d wątek(ków)]..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Strumienie pobrano do %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Nie można pobrać okładki: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Pobieranie okładki z %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Artykuł bez tytułu"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Artykuł pobrany: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Pobieranie artykułu nie powiodło się: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Pobieram strumień"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr "Ty"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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 "Zaplanowano"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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 "Dostosuj"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -8972,24 +9789,24 @@ msgstr ""
 "\n"
 "Gdzie URL to na przykład http://google.com"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 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/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 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/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -8997,7 +9814,7 @@ msgstr ""
 "Maksymalna liczba plików do pobrania. Stosowane jedynie do plików z etykiet "
 "<a href>. Wartość domyślna: %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -9005,7 +9822,7 @@ msgstr ""
 "Minimalny odstęp w sekundach pomiędzy kolejnymi pobraniami. Domyślnie to "
 "%default s"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -9013,14 +9830,14 @@ msgstr ""
 "Kodowanie znaków stron internetowych, które próbujesz pobrać. Domyślnie "
 "calibre stara się automatycznie wybrać odpowiednie kodowanie."
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -9029,7 +9846,7 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Nie pobieraj arkuszy styli CSS."
 
@@ -9415,9 +10232,18 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgstr ""
 #~ "<li><b>book-designer</b> - pliki HTML0 stworzone w Book Designer</li>"
 
+#~ msgid "and delete from library"
+#~ msgstr "i usuń z biblioteki"
+
 #~ msgid "Copying library to "
 #~ msgstr "Kopiowanie biblioteki do "
 
+#~ msgid "Click to browse books by their covers"
+#~ msgstr "Kliknij, aby przeglądać książki po okładkach"
+
+#~ msgid "Click to browse books by tags"
+#~ msgstr "Kliknij, aby przeglądać ksiązki po etykietach"
+
 #~ msgid "Change the publisher of this book"
 #~ msgstr "Zmień wydawcę tej ksiązki"
 
@@ -9739,6 +10565,16 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "The output directory. Defaults to the current directory."
 #~ msgstr "Folder wyjściowy. Domyślnie jest to bieżący folder."
 
+#~ msgid "Click to turn off Cover Browsing"
+#~ msgstr "Kliknij aby wyłączyć Przeglądanie Okładek"
+
+#~ msgid ""
+#~ "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+#~ "module failed:<br>"
+#~ msgstr ""
+#~ "<p>Przeglądanie książek za pomocą ich okładek jest wyłączone.<br>Załadowanie "
+#~ "modułu pictureflow nie powiodło się:<br>"
+
 #~ msgid "A comma separated list of tags to set"
 #~ msgstr "Lista etykiet do ustawienia oddzielonych przecinkami"
 
@@ -9893,17 +10729,44 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "Add a tab at the beginning of each paragraph"
 #~ msgstr "Dodaj tabulator na początku każdego paragrafu"
 
+#~ msgid "Send specific format to storage card B"
+#~ msgstr "Prześlij określony format na kartę pamięci B"
+
+#~ msgid "Send specific format to storage card A"
+#~ msgstr "Prześlij określony format na kartę pamięci A"
+
+#~ msgid "Send specific format to main memory"
+#~ msgstr "Prześlij określony format na główna pamięć"
+
 #~ msgid "calibre can send your books to you (or your reader) by email"
 #~ msgstr "calibre może wysłać książki do Ciebie (lub czytelnika) przez e-mail"
 
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Umożliwia komunikację z czytnikami książek Sony PRS-600/700/900."
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "Umożliwia komunikację z czytnikami książek Sony PRS-300/505/500."
+
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "Nie można uzyskać dostępu do %s. Używam katalogu %s jako biblioteki."
 
+#~ msgid "(%d found)"
+#~ msgstr "(znaleziono %d)"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "&Transliteruj znaki Unicode na ASCII."
 
 #~ msgid "Delete current search and clear search box"
 #~ msgstr "Usuń aktualne wyszukiwanie i wyczyść pole wyszukiwania"
 
+#~ msgid ""
+#~ "The format in which to output the data. Available choices: %s. Defaults is "
+#~ "text."
+#~ msgstr ""
+#~ "Format, w którym będą dane wyjściowe. Do wyboru są: %s. Domyślny to tekst."
+
+#~ msgid "Editing meta information for %d books"
+#~ msgstr "Edytowanie metadanych dla %d książek"
+
 #~ msgid "Merge books"
 #~ msgstr "Połącz książki"
diff --git a/src/calibre/translations/pt_BR.po b/src/calibre/translations/pt_BR.po
index d94abe0e5f..5891005b9d 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-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-06-01 04:13+0000\n"
-"Last-Translator: Saverio Palmieri <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-05 15:12+0000\n"
+"Last-Translator: Thomaz Rodrigues Botelho <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-02 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -70,9 +70,9 @@ msgstr "Não faz absolutamente nada"
 #: /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,8 +100,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -121,18 +121,18 @@ msgstr "Não faz absolutamente nada"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -158,11 +158,11 @@ msgstr "Tipo de arquivo"
 msgid "Metadata reader"
 msgstr "Leitor de metadados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Escritor de metadados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Gerador de catálogo"
 
@@ -282,7 +282,7 @@ msgstr ""
 "o documento de entrada."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 "Este perfil é destinado à linha SONY PRS. Os 500/505/600/700, etc."
@@ -292,62 +292,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Este perfil é destindo ao Nook da B&N.."
 
@@ -365,24 +365,24 @@ msgstr ""
 "documentos com intenção de serem lidos através do computador ou de "
 "dispositivos diversos."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr "Destinado ao iPad e dispositivos similares com resolução de 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 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:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 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:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -390,7 +390,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:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil é destinado para o Kindle DX da Amazon."
 
@@ -477,33 +477,33 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunica-se com os telefones S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 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:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 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:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
-msgstr ""
+msgstr "Atualizando a listagem de metadados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "concluído"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -513,21 +513,23 @@ msgstr ""
 "Remova usando a aplicação iBooks.\n"
 "Clique 'Mostrar Detalhes' para a lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /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:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"Algumas capas não puderam ser convertidas.\n"
+"Clique em 'Mostrar Detalhes' para a listagem."
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -566,7 +568,7 @@ msgstr "Comunica-se com o leitor ESlick."
 #: /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 ""
+msgstr "Use um diretório escolhido no dispositivo."
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
@@ -765,7 +767,7 @@ msgstr "Não há espaço suficiente no cartão de memória"
 #: /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:1178
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Notícias"
@@ -849,7 +851,7 @@ msgstr "Defina o título do livro"
 #: /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 ""
+msgstr "Configura a ordenação por título."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
@@ -859,7 +861,7 @@ msgstr "Defina o autor"
 #: /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 ""
+msgstr "Configura a ordenação por autor."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597
@@ -1372,6 +1374,12 @@ msgid ""
 "\"original\" (the default) does not change justification in the source file. "
 "Note that only some output formats support justification."
 msgstr ""
+"Mudar a justificação do texto. Um valor de \"Esquerda\" converte todo o "
+"texto justificado na origem para texto alinhado a esqueda (por ex. sem "
+"justificação). Um valor de \"Justificado\" converte todo o texto não "
+"justificado para justificado. Um valor de \"Original\" (o padrão) não muda a "
+"justificação do arquivo de origem. Note que somente alguns formatos de saída "
+"suportam justificação."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
 msgid ""
@@ -1379,6 +1387,9 @@ msgid ""
 "1.5em. Spacing removal will not work if the source file does not use "
 "paragraphs (<p> or <div> tags)."
 msgstr ""
+"Remova espaço entre parágrafos. Também configura um espaçamento de 1,5 "
+"linhas nos parágrafos. Remoção de espaços não irão funcionar se o arquivo de "
+"origem não usa parágrafos (tags <p> ou <div>)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323
 msgid ""
@@ -1386,6 +1397,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
+"Quando calibre remove espaço entre parágrafos, ele automaticamente configura "
+"um identificador de parágrafo, para segurar que os parágrafos possam ser "
+"facilmente identificados. Esta opção controla o tamanho do identificador."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
@@ -1447,6 +1461,8 @@ msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
+"Ler metadados de um arquivo OPF específico. Metadados lidos deste arquivo "
+"irão sobrescrever qualquer metadado no arquivo de origem."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
 msgid ""
@@ -1476,6 +1492,8 @@ msgstr "Defina o título."
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
 msgid "Set the authors. Multiple authors should be separated by ampersands."
 msgstr ""
+"Configura os autores. Múltiplos autores devem ser separados por \"e "
+"comercial\"."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 msgid "The version of the title to be used for sorting. "
@@ -1487,7 +1505,7 @@ msgstr "O texto a ser usado quando ordenando por autor. "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
-msgstr ""
+msgstr "Configura a capa para o arquivo específico ou URL"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
@@ -1537,7 +1555,7 @@ msgstr "Defina o idioma."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
-msgstr ""
+msgstr "Configura a data da publicação."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
@@ -1549,11 +1567,11 @@ msgstr "Não foi possível encontrar um ebook dentro do arquivo."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
-msgstr ""
+msgstr "Valores para índices de séries e nota devem ser números. Ignorando"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
-msgstr ""
+msgstr "Falhou para decompor data/hora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
@@ -1561,7 +1579,7 @@ msgstr "Convertendo entrada para HTML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
-msgstr ""
+msgstr "Executando transformações no ebook..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
@@ -1572,6 +1590,8 @@ 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 ""
+"Extrair o conteúdo do arquivo EPUB gerado para o diretório especificado. O "
+"conteúdo do diretório é inicialmente apagado, então tenha cuidado."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
@@ -1593,6 +1613,10 @@ msgid ""
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
+"Divide todos os arquivos HTML maiores que este tamanho (em KB). Isto é "
+"necessário uma vez que os leitores de EPUB não podem ler arquivos de tamanho "
+"grande. O padrão de %defaultKB é o tamanho requerido para o Adobe Digital "
+"Editions."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
 msgid ""
@@ -1600,6 +1624,9 @@ msgid ""
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
+"Normalmente, se o arquivo de entrada não tem capa e você não especificou "
+"uma, uma capa padrão é gerada com o título, autores, etc. Esta opção "
+"desabilita a geração desta capa."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
 msgid ""
@@ -1608,6 +1635,9 @@ msgid ""
 "JetBook Lite. Without this option, such devices will display the cover as a "
 "blank page."
 msgstr ""
+"Não use SVG para a capa do livro. Use esta opção se seu EPUB irá ser usado "
+"em um dispositivo que não suporta SVG, como o iPhone ou o JetBook Lite. Sem "
+"esta opção, os dispositivos irão mostrar a capa como uma página em branco."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
 msgid ""
@@ -1617,20 +1647,26 @@ 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 ""
+"Quando estiver usando uma capa SVG, esta opção irá fazer a capa se ajustar "
+"ao tamanho da área da tela, mas preservando seu aspecto sem deformação "
+"(largura e comprimento). Isto quer dizer que pode haver bordas brancas nos "
+"lados ou na parte de cima e em baixo da imagem, mas ela nunca ficará "
+"deformada. Sem esta opção a imagem pode ser visivelmente deformada, mas não "
+"haverão bordas brancas."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
-msgstr ""
+msgstr "Iniciar"
 
 #: /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 ""
+msgstr "Tabela de conteúdos:"
 
 #: /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 ""
+msgstr "Não insira uma Tabela de Conteúdos no início do livro."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32
@@ -1638,7 +1674,7 @@ msgstr ""
 #: /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 ""
+msgstr "Adicione uma Tabela de Conteúdo no início do livro."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:243
 msgid ""
@@ -1702,19 +1738,19 @@ 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 ""
+msgstr "Não foi possível decompor o arquivo: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
-msgstr ""
+msgstr "%s é um arquivo vazio"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
-msgstr ""
+msgstr "Falhou em decompor o link %s %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
-msgstr ""
+msgstr "Não foi possivel adicionar o link %s a Tabela de Conteúdos"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
@@ -1934,7 +1970,7 @@ msgid "Comments"
 msgstr "Comentários"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -1944,7 +1980,7 @@ msgid "Tags"
 msgstr "Tags"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2174,7 +2210,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Capas"
 
@@ -2213,70 +2249,70 @@ 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 "Sumário"
 
-#: /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 "Glossário"
 
-#: /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 "Agradecimentos"
 
-#: /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 "Bibliografia"
 
-#: /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 "Colofão"
 
-#: /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 "Copyright"
 
-#: /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 "Dedicatória"
 
-#: /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 "Epígrafe"
 
-#: /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 "Prefácio"
 
-#: /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 "Lista de Ilustrações"
 
-#: /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 "Lista de Tabelas"
 
-#: /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 "Notas"
 
-#: /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 "Prefácio"
 
-#: /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 "Texto Principal"
 
@@ -2751,20 +2787,24 @@ msgstr "Sobrescrever autor e título com os novos metadados"
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /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:138
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Copiado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr ""
 
@@ -2772,65 +2812,65 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Adicionando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /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:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Nenhum livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Adicionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Foram encontradas duplicatas!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Salvo"
 
@@ -2918,15 +2958,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -2935,6 +2975,8 @@ msgstr ""
 #: /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
@@ -2943,6 +2985,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/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
@@ -3050,8 +3094,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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr ""
 
@@ -3731,20 +3775,20 @@ msgstr ""
 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:2137
+#: /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 ""
 
-#: /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 ""
 
@@ -4470,165 +4514,165 @@ 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 "System port selected"
 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 ""
 "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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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 "Erro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a 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:570
 msgid "Choose plugin"
 msgstr "Escolher plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Este plugin não pode ser desativado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 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:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Plugin não configurável"
 
-#: /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: %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:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr "Registro de erros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Registro de acessos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Tamanho inválido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 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:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4739,271 +4783,275 @@ msgstr ""
 msgid "Sending to &device"
 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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 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:531
 msgid "Show notification when &new version is available"
 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:532
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 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:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 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:535
 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:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " segundos"
 
-#: /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:537
 msgid "Choose &language (requires restart):"
 msgstr "Selecionar &idioma (requer reinicialização):"
 
-#: /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:538
 msgid "Normal"
 msgstr "Normal"
 
-#: /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:539
 msgid "High"
 msgstr "Alta"
 
-#: /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:540
 msgid "Low"
 msgstr "Baixa"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /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:542
 msgid "Preferred &output format:"
 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:543
 msgid "Preferred &input format order:"
 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:546
 msgid "Use &Roman numerals for series number"
 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:547
 msgid "Enable system &tray icon (needs restart)"
 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:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
-msgid "Show cover &browser in a separate window (needs restart)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
-msgid "Search as you type"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
-msgid "Automatically send downloaded &news to ebook reader"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
-msgid "&Delete news from library when it is automatically sent to reader"
+msgid "Show &splash screen at startup"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
-msgid "&Number of covers to show in browse mode (needs restart):"
+msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+msgid "Search as you type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+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:554
+msgid "&Number of covers to show in browse mode (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: /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 "Large"
 msgstr "Grande"
 
-#: /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 "Medium"
 msgstr "Médio"
 
-#: /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 "Small"
 msgstr "Pequeno"
 
-#: /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 "&Button size in toolbar"
 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 "Show &text in toolbar buttons"
 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 "Select visible &columns in library view"
 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 "Remove a user-defined column"
 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:565
 msgid "Add a user-defined column"
 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 "Edit settings of a user-defined column"
 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 "Use internal &viewer for:"
 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 "Add an email address to which to send books"
 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:572
 msgid "&Add email"
 msgstr "&Adicionar e-mail"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Tornar &padrão"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "&Remover e-mail"
 
-#: /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:575
 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:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 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:577
 msgid "&Check database integrity"
 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:578
 msgid "&Install command line tools"
 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:579
 msgid "Open calibre &configuration directory"
 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:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /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:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /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:582
 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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 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:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 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:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 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:591
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "&Interromper servidor"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "&Testar servidor"
 
-#: /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:594
 msgid "Run server &automatically on startup"
 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:595
 msgid "View &server logs"
 msgstr "Ver &registros do 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:596
 #: /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 "
@@ -5014,33 +5062,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:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 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:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Ativar/&Desativar plugin"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "&Configurar plugin"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "&Remover plugin"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Instalar novo plugin"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "&Arquivo de plugin:"
 
-#: /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:605
 msgid "&Add"
 msgstr "&Adicionar"
 
@@ -5477,7 +5525,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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr "Livros"
 
@@ -5671,6 +5719,39 @@ msgstr ""
 msgid "Aborting..."
 msgstr "Cancelando..."
 
+#: /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 ""
@@ -5905,29 +5986,28 @@ msgstr ""
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Autores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr "Editoras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /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:161
+#: /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
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
-msgstr "Editor de tags"
+msgid "User Categories Editor"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
@@ -5974,6 +6054,7 @@ 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 "Você tem certeza?"
 
@@ -5983,6 +6064,10 @@ msgid ""
 "to delete them?"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr "Editor de tags"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr ""
@@ -6019,6 +6104,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:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "Testar configurações de e-mail"
@@ -6387,7 +6532,7 @@ msgstr ""
 
 #: /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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
@@ -6417,51 +6562,51 @@ msgstr ""
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
 msgid "Ascending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
 msgid "Change text alignment for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Left"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Right"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6541,111 +6686,119 @@ msgstr "Abrir eBook"
 msgid "Configure"
 msgstr "Configurar"
 
-#: /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
+#: /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:74
+#: /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:75
+#: /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:145
+#: /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:146
+#: /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:150
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 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:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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:206
 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:219
 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:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s já está em execução."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 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:283
 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:285
 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:288
 msgid "try rebooting your computer."
 msgstr "tente reiniciando o seu computador"
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "tente eliminando o arquivo"
 
@@ -6763,7 +6916,7 @@ msgid "Send to device"
 msgstr "Enviar para o dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Salvar no disco"
 
@@ -6788,7 +6941,7 @@ msgid "C"
 msgstr "C"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Exibir"
 
@@ -6963,11 +7116,44 @@ msgstr ""
 msgid "Cover browser could not be loaded: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:235
+#: /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
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -7009,83 +7195,83 @@ msgid ""
 "reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:68
+#: /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:155
+#: /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:161
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:184
+#: /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:201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "&Restaurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "Faça uma &doação para contribuir com calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:274
+#: /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:276
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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)"
@@ -7094,7 +7280,7 @@ msgstr ""
 "diretório, assumindo que cada arquivo é o mesmo livro em um formato "
 "diferente)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:298
+#: /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)"
@@ -7102,105 +7288,105 @@ 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:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
+#: /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:368
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:414
+#: /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:417
+#: /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:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:473
+#: /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:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Navegar pelas capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Conectado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7216,210 +7402,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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 "Nenhum livro selecionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1126
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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 "Enviando livros ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "Livros EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "Livros LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "Livros HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "Livros LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "Livros MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Livros TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "Livros PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "HQs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Falhou na leitura dos metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 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:1425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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 "Nenhum livro selecionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1494
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1511
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Eliminar livros do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Não foi possível obter metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "metadados sociais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Baixando %s para %d livro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1599
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Falhou ao obter alguns metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1600
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 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:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Falhou em obter metadados:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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 "Não foi possível editar metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1681
+#: /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 "
@@ -7427,7 +7613,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1692
+#: /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 "
@@ -7437,89 +7623,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:1704
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1803
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Não foi possível salvar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Escolher diretório de destino"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Erro ao salvar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "Ocorreu um erro ao salvar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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 "Não foi possível salvar alguns livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1870
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1887
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1921
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2145
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
+#: /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 "
@@ -7527,106 +7713,106 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
 msgid "Cannot open folder"
 msgstr "Não foi possível abrir o diretório"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Não foi possível configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2343
+#: /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 ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Erro ao converter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Falha</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Atualização disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -8866,7 +9052,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -8959,27 +9145,27 @@ msgstr ""
 msgid "Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Compactando banco de dados"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
@@ -9163,10 +9349,13 @@ 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:124
 msgid "%d books"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
 msgstr ""
@@ -9428,93 +9617,93 @@ msgstr ""
 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:595
 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:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Download concluído"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "Falha ao baixar os seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tLinks que falharam:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:842
 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:847
 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:853
 msgid "Trying to download cover..."
 msgstr "Tentando obter capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 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:936
 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:952
 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:962
 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:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Baixando capa de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Artigo sem título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Artigo transferido: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 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:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -9535,7 +9724,7 @@ msgstr "Agendado"
 msgid "Custom"
 msgstr "Personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9545,48 +9734,54 @@ msgstr ""
 "\n"
 "Onde URL é, por exemplo, http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 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:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 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:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 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:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 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:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 ""
+"Somente links que correspondem a esta expressão regular serão seguidos. Esta "
+"opção pode ser especificada multiplas vezes, no caso, toda vez que um link "
+"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:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -9594,8 +9789,13 @@ msgid ""
 "filter-regexp and --match-regexp are specified, then --filter-regexp is "
 "applied first."
 msgstr ""
+"Qualquer link que corresponda a esta expressão regular será ignorado. Esta "
+"opção pode ser especificada multiplas vezes, e no caso, sempre que alguma "
+"das expressões regulares corresponder a um link, ele será ignorado. Por "
+"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:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Não baixar folhas de estilo CSS."
 
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index 51eab325a0..a6b1c67648 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-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:26+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:59+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-05-30 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -21,156 +21,156 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,329,-1,-1\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "Ничего не делает"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "Основной"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "Тип файла"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "Чтение метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Запись метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Генератор каталога"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 "
@@ -180,7 +180,7 @@ msgstr ""
 "содержащий все связанные файлы. Этот модуль запускается каждый раз, когда вы "
 "добавляете HTML файл в библиотеку."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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."
@@ -188,7 +188,7 @@ msgstr ""
 "Кодировка для входящих HTML файлов. Наиболее популярные: cp1251, latin1, iso-"
 "8859-1 и utf-8."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -198,57 +198,57 @@ msgstr ""
 "pmlname_img либо images. Этот плагин запускается каждый раз когда в "
 "библиотеку добавляется  PML-файл."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "Извлечь обложку из файлов комикса"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Читать метаданные из книг в архивах RAR"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Читать метаданные из книг в архивах ZIP"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "Внести метаданные из файлов %s"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "Вход конвертера"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -260,11 +260,11 @@ msgstr ""
 "Данная опция может быть полезна для документа, не имеющего информации о "
 "кодировке, или для документа, в котором указаны неверные параметры кодировки."
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "Выход конвертера"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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."
@@ -272,11 +272,11 @@ msgstr ""
 "Если отмечено, модуль вывода попытается форматировать вывод в удобном для "
 "чтения виде. Может не работать на некоторых модулях вывода."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "Профиль ввода"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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."
@@ -284,83 +284,83 @@ msgstr ""
 "Этот профиль пытается обеспечить приемлемые значения по умолчанию и может "
 "быть полезен, если вы ничего не знаете о входном документе."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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/trunk/src/calibre/customize/profiles.py:69
+#: /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/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Этот профиль предназначен для SONY PRS 900."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Этот профиль предназначен для Microsoft Reader."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Этот профиль предназначен для книг Mobipocket"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Этот профиль предназначен для Hanlin V3 и её клонов."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Этот профиль предназначен для Hanlin V5 и её клонов."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "Этот профиль предназначен для Cybook G3."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Этот профиль предназначен для Cybook Opus."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Этот профиль предназначен для Amazon Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Этот профиль предназначен для iRex Illiad."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Этот профиль предназначен для iRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Этот профиль предназначен для IRex Digital Reader 800."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Этот профиль предназначен для  B&N Nook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "Профиль вывода"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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 "
@@ -370,24 +370,24 @@ msgstr ""
 "полезным, если вы хотите подготовить документ, предназначенный для чтения на "
 "компьютере или на нескольких различных устройствах."
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Этот профиль предназначен для  SONY PRS-300"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Этот профиль предназначен для 5-дюймовой JetBook."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -395,35 +395,35 @@ msgstr ""
 "Этот профиль предназначен для линейки SONY PRS: 500/505/700 - в ландшафтном "
 "режиме. Полезен для комиксов."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Этот профиль предназначен для Amazon Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "Установленные модули"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "Назначения модулей типов файлов"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "Настройка локального модуля"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "Отключенные модули"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "Не найден подходящий модуль в "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Неудачная инициализация модуля %s:"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -435,38 +435,38 @@ msgstr ""
 "    Настроить calibre при помощи внешних модулей.\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Установите модуль, указав путь к zip файлу, содержащему его."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Удалить модуль по имени. Не действует на встроенные модули"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Настроить модуль. Укажите имя модуля и строку настроек, разделённые запятой."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "Вывести список всех установленных модулей"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "Включить указанный модуль"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "Отключить указанный модуль"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "Общение с телефонами Android."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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"
@@ -474,174 +474,215 @@ msgstr ""
 "Разделённый запятаями список директории для отправки e-books на это "
 "устройство. Будет использовано первое в списке устройство"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr "Связь с телефоном S60"
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "Общение с устройством для чтения электронных книг Binatone Readme."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "Общение со смартфоном Blackberry."
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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/trunk/src/calibre/devices/cybook/driver.py:22
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr ""
 "Общение с устройством для чтения электронных книг Cybook Gen 3 / Opus eBook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "Соединяться с EB600."
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "Соединяться с ESlick."
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Соединяться с Hanlin V3"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Соединяться с Hanlin V5"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "Соединяться с BOOX"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Communicate with the Hanvon N520"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Связь с электронной книгой Elonex EB 511"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Соединяться с IRex Iliad."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "Джош Шембер"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "Соединяться с Hanlin V3"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "Соединяться с Hanlin V5"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+msgstr "Соединяться с BOOX"
+
+#: /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"
+
+#: /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 "Связь с электронной книгой Elonex EB 511"
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+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 "Соединяться с iRex Digital Reader 1000."
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "Сообщение с IRex Digital Reader 800."
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "Соединяться с Iriver Story."
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "Соединяться с JetBook."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Соединяться с Kindle."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Соединяться с Kindle 2."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Соединяться с Kindle DX."
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr "Связь с Kobo Reader"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "Связь с Palm Pre"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Подключен к Nokia 770 internet tablet."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "Подключен к Nokia 810 internet tablet."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "Укромный уголок"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "Работать с устройством Nook eBook reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "Соединяться с Nuut2."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Соединяться с Sony PRS-500."
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/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:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "Соединяться с Sony PRS-300/505/500."
-
-#: /home/kovid/work/trunk/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: "
@@ -649,63 +690,45 @@ msgstr ""
 "Разделенный запятыми список полей метаданных преобразовать в коллекции на "
 "устройстве. Возможности включают: "
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "Передаю книги на устройство..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "Безымянный"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Удаляю книги с устройства..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Отправляю метаданные на устройство..."
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr "Связь с электронной книгой Samsung SNE"
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "Сообщение с Teclast K3 reader."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Не удалось определить диск %s. Попробуйте перезагрузить устройство."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 "Невозможно определить точку монтирования %s. Попробуйте перезагрузку."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "Не удалось определить диск %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "Не могу найти mount helper: %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
@@ -713,156 +736,172 @@ msgstr ""
 "Не удалось обнаружить диск %s. Возможно, ваше ядро использует устаревшую "
 "версию SYSFS."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Невозможно примонтировать основную память (Код ошибки: %d)"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr "В устройство не вставлена карта памяти."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "Выбранный слот: %s не поддерживается."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "Не хватает свободного места в основной памяти"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "Не хватает свободного места на карте памяти"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "Новости"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Настройка устройства"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "настройки драйверов устройств"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr "Сортированный список форматов, поддерживаемых устройством"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "Получить метаданные из файлов на устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "Шаблон контроля способа сохранения книг"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "Дополнительная настройка"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "Соединиться с электронной книгой."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "Получаю информацию об устройстве..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "Добавляю книги в список метаданных устройства..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "Удаляю книги из списка метаданных устройства..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "Отправляю метаданные на устройство..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [options] mybook.chm"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "Выходная директория. Текущая директория используется по умолчанию"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr "Путь к текстожому файлу, содержащему коментарий"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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 "Извлечь миниатюру из файла lrf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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."
@@ -870,24 +909,24 @@ msgstr ""
 "Извлечь обложку из файла lrf. Замечание: если LRF форма не содержит обложку, "
 "используйте вместо этого какую-нибудь эврестически подобранную обложку."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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 "Ввести ID книги"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr "Установить дельту шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr "Обработано %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "Сбой %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
@@ -897,7 +936,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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 "
@@ -907,22 +946,22 @@ msgstr ""
 "%default. Значения менее 256 могутт привести к размытости текста на "
 "устройстве, если вы создаёте ваши комиксы в формате EPUB."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "Отменить повышение резкости."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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."
@@ -930,11 +969,11 @@ msgstr ""
 "Отключить обрезку страниц комиксов. В некоторых коммиксах данная опция может "
 "удалять содержимое вместе с границами."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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."
@@ -942,7 +981,7 @@ msgstr ""
 "Сохранить формат картинки и масштаб, используя высоту экрана как ширину для "
 "просмотра в альбомном режиме."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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."
@@ -950,7 +989,7 @@ msgstr ""
 "Используется для публикаций справа налево, таких, как манга (японские "
 "комиксы). Альбомные страницы разделяются на портретные справа налево."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:302
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:302
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -958,7 +997,7 @@ msgstr ""
 "Разрешить подчистку. Уменьшает пятнистый шум. Может значительно увеличить "
 "время обработки."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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."
@@ -967,7 +1006,7 @@ msgstr ""
 "Вместо этого использовать тот порядок, в котором они были добавлены в "
 "комиксы."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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 "
@@ -976,20 +1015,20 @@ msgstr ""
 "Формат картинок в созданной книге. Вы можете подбирать нужный Вам формат с "
 "оптимальным размером и отображением на вашем устройстве."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "Не обрабатывать изображения"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -1037,31 +1076,31 @@ msgstr ""
 "\n"
 "Для получения полной информации по системе преобразования обратитесь к\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "ВХОДНЫЕ ОПЦИИ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr "Опции для контроля обработки входного файла %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "ВЫХОДНЫЕ ОПЦИИ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "Опции для контроля обработки выходного файла %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "Контроль автоопределения структуры документа."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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 "
@@ -1071,28 +1110,28 @@ msgstr ""
 "файл имеет содержание, оно будет использоваться вместо автоматически "
 "сгенерированного."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "Опции для установки метаданных выходного файла"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "Опции для облегчения отладки преобразования"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "Вывести встроенные рецепты"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr "Выходные данные сохранены в"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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 "
@@ -1102,7 +1141,7 @@ msgstr ""
 "Полезно если вы не уверены, на какой стадии процесса конвертации происходит "
 "ошибка."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1113,7 +1152,7 @@ msgstr ""
 "интерпретировать различную информацию внутри исходного документа. Например, "
 "длина зависит от разрешения (длина в пикселях). Варианты:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1125,7 +1164,7 @@ msgstr ""
 "случаях профиль вывода требуется для создания файлов, которые смогут быть "
 "прочитаны на устройстве. Например, EPUB для электронных книг SONY. Варианты:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1137,7 +1176,7 @@ msgstr ""
 "тем больше будет размер шрифта в книге, и наоборот. По умолчанию базовый "
 "размер шрифта выбирается из настроек выбранного профиля."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1151,11 +1190,11 @@ msgstr ""
 "Алгоритм масштабирования шрифтов использует эти размеры для правильного "
 "масштабирования. По умолчанию используются настройки выбранного профиля."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr "Запретить масштабирование шрифтов."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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."
@@ -1163,7 +1202,7 @@ msgstr ""
 "Высота строки в пунктах. Влияет на расстояние между строками текста. По "
 "умолчанию высота строки не изменяется."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1175,7 +1214,7 @@ msgstr ""
 "зачастую становится неудобочитаемым. Эта опция указывает, что нужно "
 "извлекать содержимое из таблиц и представлять его в линейном виде."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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 "
@@ -1184,7 +1223,7 @@ msgstr ""
 "Выражение XPath добавит все заданные теги в первый уровень содержания. Если "
 "выражение задано, то оно имеет преимущество над автоопределением."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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 "
@@ -1193,7 +1232,7 @@ msgstr ""
 "Выражение XPath добавит все заданные теги во второй уровень содержания. "
 "Каждая запись добавляется под предыдущий уровень, одной строкой."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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 "
@@ -1202,7 +1241,7 @@ msgstr ""
 "Выражение XPath добавит все заданные теги в третий уровень содержания. "
 "Каждая запись добавляется под предыдущий уровень."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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 "
@@ -1212,11 +1251,11 @@ msgstr ""
 "автогенерации. Если опция включена, всегда используется автоматически "
 "созданное содержание."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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"
@@ -1224,7 +1263,7 @@ msgstr ""
 "Если обнаружено меньшее число глав, чем указано, то ссылки добавляются в "
 "содержание. По умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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 "
@@ -1234,7 +1273,7 @@ msgstr ""
 "отключения. По умолчанию %default. Ссылки добавляются в оглавление только "
 "если количество найденных глав меньше порогового."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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."
@@ -1242,7 +1281,7 @@ msgstr ""
 "Удаление записей, названия которых соответствуют указанному регулярному "
 "выражению, из содержания. Соответствующие записи и их потомки будут удалены."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1258,7 +1297,7 @@ msgstr ""
 "выражение \"/\". Для получения подробной информации по использованию XPath "
 "обращайтесь к разделу XPath Tutorial в Руководстве Пользователя."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1270,7 +1309,7 @@ msgstr ""
 "пустую строку перед главами. Значение \"нет\" отключит разметку глав, а "
 "значение \"оба\" будет вставлять и разрывы страниц, и пустые строки."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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 "
@@ -1279,41 +1318,41 @@ msgstr ""
 "Введите путь к CSS. Эта CSS будет включена в правила стиля исходного файла, "
 "поэтому она может быть использована для переопределения этих правил."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr ""
 "Выражение XPath. Разрывы страниц вставляются перед указанными элементами."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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 ""
 "Укажите верхний отступ в пунктах. По умолчанию %default. Примечание: 72 "
 "пункта соответствуют 1 дюйму (2,54 см)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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 ""
 "Укажите нижний отступ в пунктах. По умолчанию %default. Примечание: 72 "
 "пункта соответствуют 1 дюйму (2,54 см)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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 ""
 "Укажите левый отступ в пунктах. По умолчанию %default. Примечание: 72 пункта "
 "соответствуют 1 дюйму (2,54 см)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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 ""
 "Укажите правый отступ в пунктах. По умолчанию %default. Примечание: 72 "
 "пункта соответствуют 1 дюйму (2,54 см)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1322,7 +1361,7 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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 "
@@ -1332,7 +1371,7 @@ msgstr ""
 "1.5em. Удаление промежутков не будет работать, если в исходном документе "
 "параграфы (теги <p> или <div>) не используются."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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. "
@@ -1342,14 +1381,14 @@ msgstr ""
 "устанавливает отступ параграфам для удобочитаемости. Эта опция контролирует "
 "ширину отступа."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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)."
@@ -1357,7 +1396,7 @@ msgstr ""
 "Вставлять пустую строку между параграфами. Не будет работать, если в "
 "исходном документе параграфы (теги <p> или <div>) не используются."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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."
@@ -1366,7 +1405,7 @@ msgstr ""
 "картинка в файле-источнике - обложка, а вы собираетесь указать другую "
 "обложку."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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."
@@ -1374,7 +1413,7 @@ msgstr ""
 "Вставить метаданные в начале книги. Полезно, если ваше устройство не "
 "поддерживает вывод метаданных."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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."
@@ -1383,23 +1422,23 @@ msgstr ""
 "исходном файле. Это может сделать еще хуже, так что используйте с "
 "осторожностью."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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."
@@ -1407,7 +1446,7 @@ msgstr ""
 "Прочитать метаданные из указанного OPF-файла. Метаданные, прочитанные таким "
 "образом, заменят все метаданные исходного документа"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1424,7 +1463,7 @@ msgstr ""
 "представление, которое используется большинством (китайское для предыдущего "
 "примера)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1434,107 +1473,107 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr "Строка, используемая при сортировке по авторам. "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
 msgstr "Установить обложку для указанного файла или URL"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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 "Указать рейтинг. Может быть числом от 1 до 5."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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 "Указать ISBN книги."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr "Установить дату публикации."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
 msgstr ""
 "Установить временную метку книги (используется столбцом даты в calibre)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "Не могу найти книгу в архиве"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr "Невозможно разобрать дату / время"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr "Конвертирую входной файл в HTML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr "Выполняю преобразования книги..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr "Создаю"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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."
@@ -1542,7 +1581,7 @@ msgstr ""
 "Извлечь содержимое генерируемого EPUB файла в указанную директорию. "
 "Содержимое директории сначала будет удалено, так что будьте осторожны."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1557,7 +1596,7 @@ msgstr ""
 "очень большое количество разрывов страниц, лучше отключить разбивку по "
 "разрывам страниц."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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 "
@@ -1568,7 +1607,7 @@ msgstr ""
 "размера. Размер %defaultкB, установленный по умолчанию, является требуемым "
 "размером для Adobe Digital Editions."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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 "
@@ -1578,7 +1617,7 @@ msgstr ""
 "умолчанию обложка генерируется из названия, авторов и т.д. Этот параметр "
 "отключает генерацию такой обложки."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1586,7 +1625,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1595,29 +1634,29 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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."
@@ -1625,7 +1664,7 @@ msgstr ""
 "В файлах HTML в первую очередь следовать по соседним ссылкам. Обычно, "
 "сначала следование идёт в глубину."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:250
+#: /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. "
@@ -1635,7 +1674,7 @@ msgstr ""
 "Значение должно быть неотрицательным. 0 указывает, что следование по ссылкам "
 "производиться не будет. По умолчанию %default."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1647,7 +1686,7 @@ msgstr ""
 "том, что делаете, иначе она может привести к непредсказуемым побочным "
 "эффектам."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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."
@@ -1655,60 +1694,60 @@ msgstr ""
 "Средняя длина строки для переноса строк, если HTML из предыдущей частичной "
 "конвертации PDF файла. Значение по умолчанию %default."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr "Создание LIT файла из EPUB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr "\tФайл Book Designer определен."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr "\tАнализ HTML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tФайл Baen определен. Повторный анализ..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr "Записать предвартельную обработку HTML в "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "Обработано %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr "\tПреобразование в BBeB..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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 "Не удалось разобрать файл: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr "%s пустой файл"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr "Ошибка анализа ссылки %s %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr "Не могу добавить ссылку %s в TOC"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
 msgstr "Невозможный процесс изображения %s. Ошибка: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr "Невозможный процесс чередования PNG %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1716,13 +1755,13 @@ msgstr ""
 "Неудачный процесс изображения: %s\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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 ""
 "Призошла ошибка при обработке таблицы: %s. Пропустить разметку таблицы."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1730,23 +1769,23 @@ msgstr ""
 "Плохая таблица:\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr "Не могу прочитать файл обложки: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr "Не могу прочитать из: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr "Ошибка процесса файла opf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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"
@@ -1754,31 +1793,31 @@ msgstr ""
 "%prog book.lrf\n"
 "Преобразовывает файл LRF в файл LRS (XML кодировка UTF-8)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr "Выходной файл LRS"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr "Анализ LRF..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "Создание XML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr "LRS пишет "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr "Не могу прочитать файл эскиз:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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."
@@ -1786,24 +1825,24 @@ msgstr ""
 "%prog [options] file.lrs\n"
 "Сборка файла LRS из файла LRF."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr "Путь для файла результата"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
 msgstr "Преобразование LRS в LRS, необходимо для отладки."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr "Испорчен LRF файл. Невозможно ввести метаданные."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1817,27 +1856,27 @@ msgstr ""
 "Показать/Редактировать метаданные в файле LRF.\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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 ""
 "Путь к текстовому файлу содержащему комментарии сохраняемые в файл lrf."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
 msgstr "Укажите отступ между словами в интервалах. По умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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"
@@ -1845,13 +1884,13 @@ msgstr ""
 "Указать формат верхнего колонтитула. %a будет заменено на автора и %t на "
 "заголовок. По умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
 msgstr ""
 "Добавить дополнительно пробелы перед заголовком. По умолчанию %default "
 "пунктов."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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"
@@ -1859,7 +1898,7 @@ msgstr ""
 "Минимальный отступ абзаца (отступ первой строки абзаца) в интервалах. По "
 "умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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)"
@@ -1867,7 +1906,7 @@ msgstr ""
 "Представить таблицы в HTML как изображения (может быть полезным, если в "
 "документе содержатся большие или сложные таблицы)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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"
@@ -1875,104 +1914,108 @@ msgstr ""
 "Умножить значение размера текста в отображаемых таблицах на это значение. По "
 "умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr "Serif семейство шрифтов вставлено"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr "Sans-serif семейство шрифтов вставлено"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr "Набор шрифтов для использования серии \"monospace\""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr "Комикс"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "Заголовок"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "Издатель"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Спонсор"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "Комментарии"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "Теги"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "Серия"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "Язык"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "Временная метка"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "Опубликовано"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "Права"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr "ПРОСМОТР РЕДАКТИРОВАНИЯ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
@@ -1980,11 +2023,11 @@ msgstr ""
 "Распаковать основные форматы электронных книг из архивов (zip/rar). Также "
 "попытаться распознать, если они действительно cbz/cbr файлы."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr "параметры"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -2010,7 +2053,7 @@ msgstr ""
 "метаданные будут\n"
 "проигнорированы.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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."
@@ -2018,7 +2061,7 @@ msgstr ""
 "Вписать авторов. Несколько авторов разделяются символом &. Имена должны быть "
 "указаны в порядке: Имя Фамилия."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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."
@@ -2026,7 +2069,7 @@ msgstr ""
 "Версия заголовка для сортировки. Если не указан, а заголовок указан, будет "
 "авто-сгенерирован из заголовока."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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)."
@@ -2034,29 +2077,29 @@ msgstr ""
 "Срока для сортировки по автору. Если не указана, а авторы указаны, будет "
 "авто-сгенерирована из списка авторов."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr "Указать файл обложки."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr "Установить категорию книги"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr "Установить дату публикации"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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 "Укажите имя файла OPF. Метаданные будут сохранены в этом OPF файле."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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 "
@@ -2066,63 +2109,63 @@ msgstr ""
 "для книги. Метаданные указанные в командной строке заместят метаданные "
 "прочитанные из OPF файла."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr "Указать BookID в файлах LRF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr "Файл не указан"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr "Исходные метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr "Измененные метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr "OPF создан в"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr "Обложка сохранена"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr "Обложка отсутствует"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "Загрузка метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr "рейтинги"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "теги"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr "Загрузка %s из %s"
 
-#: /home/kovid/work/trunk/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 "Загрузка метаданных из Книг Google"
 
-#: /home/kovid/work/trunk/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 "Загрузка метаданных из isbndb.com"
 
-#: /home/kovid/work/trunk/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."
@@ -2130,11 +2173,11 @@ msgstr ""
 "Для использования isbndb.com вы должны подписаться %sfree account%s и ввести "
 "перед этим ваш ключ доступа."
 
-#: /home/kovid/work/trunk/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 "Загрузить общедоступные метаданные из amazon.com"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -2158,27 +2201,27 @@ msgstr ""
 "регистрации на isbndb.com.\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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 который вы хотите использовать в метаданных."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "Автор книги, которого вы хотите найти."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "Название книги, которую вы хотите найти."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr "Издательство книги, которое вы хотите найти."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr "LibraryThing.com таймаут. Попробуйте позже."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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."
@@ -2186,15 +2229,15 @@ msgstr ""
 "Не могу загрузить обложку так, как сервер сильно загружен. Пожалуста, "
 "повторите попытку позднее."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " Не найдено."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr "Ошибка сервера LibraryThing.com. Попробуйте позднее."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -2207,20 +2250,20 @@ msgstr ""
 "Загрузка изображения обложки для книги распознается через ISBN на сайте "
 "LibraryThing.com\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Обложка"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr "Модифицировать картинки согласно ограничениям Palm."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr "Если имеется поле сортировки по автору, используйте его как автор."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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."
@@ -2228,142 +2271,138 @@ msgstr ""
 "Не добавлять в конец книги содержание. Полезно, если у книги уже есть "
 "основное содержание."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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 "Заголовок для любых сгенерированных in-line оглавлений."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr "Отказаться от сжатия содержимого файла."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "Все статьи"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Это книга Amazon Topaz. Она не может быть прочитана."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr "Индекс"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr "Глоссарий"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr "Подтверждения"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "Библиография"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr "эмблема издательства"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "Копирайт"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr "Посвящение"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr "Эпиграф"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr "Предисловие"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "Заметки"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "Введение"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "%s формат книг не поддерживается"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr "Варианты создания HTML содержания"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr "Переплет книги"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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 ""
 "Не могу найти приемлимое место разделения: %s Размер поддерева: %d КБ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "Безымянный"
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr "Варианты создания OPF/NCX/др."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr "OPF вариант для создания. По умолчанию %default."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
 msgid ""
 "Generate an Adobe \"page-map\" file if pagination information is available."
 msgstr ""
 "Создать Adobe \"page-map\" файл если доступна информация о разбиении на "
 "страницы."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr "Примечания"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr "Врезка"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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."
@@ -2371,9 +2410,9 @@ msgstr ""
 "Обычно calible воспринимает пустые строки как разделители абзацев. С этой "
 "установкой каждый перенос будет воспринят как новый абзац."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2385,11 +2424,11 @@ msgstr ""
 "(табуляции или 2+ пробелов), представляет собой абзац. Абзац заканчивается "
 "при достижении строки, начинающейся с отступа."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
 msgstr "Формат, используемый вместо pdb контейнера. Выберите:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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."
@@ -2397,22 +2436,22 @@ msgstr ""
 "Укажите кодировку исходящего документа. Кодировка по умолчанию cp1252. "
 "Примечание: Этот параметр учитывается не всеми форматами."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr "Не извлекать изображения из документа"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr "Использовать новый PDF конвертер."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2432,7 +2471,7 @@ msgstr ""
 "\n"
 "Управление PDF.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2442,36 +2481,36 @@ msgstr ""
 "\n"
 "Обрезать PDF файл.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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 "Количество точек для обрезания от самой левой x (по умолчанию: %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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 "Количество точек для обрезания от самой левой y (по умолчанию: %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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 "Количество точек для обрезания от самой правой x (по умолчанию: %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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 "Количество точек для обрезания от самой правой y (по умолчанию: %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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`"
@@ -2480,21 +2519,21 @@ msgstr ""
 "каждую страницу `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> "
 "bounding`"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr "Опции обрезки:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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 "Опции контроля преобразования pdf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
 msgid ""
 "[options] file.pdf password\n"
 "\n"
@@ -2504,11 +2543,11 @@ msgstr ""
 "\n"
 "Дешифровать PDF.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr "Параметры дешифрования:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
 msgid ""
 "[options] file.pdf password\n"
 "\n"
@@ -2518,11 +2557,11 @@ msgstr ""
 "\n"
 "Шифровать PDF.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr "Параметры шифрования:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21
 msgid ""
 "file.pdf ...\n"
 "\n"
@@ -2532,31 +2571,31 @@ msgstr ""
 "\n"
 "Получить информацию о PDF.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr "Автор"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr "Тема"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr "Автор"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr "Страницы"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr "Размер файла"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr "Версия PDF"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2570,11 +2609,11 @@ msgstr ""
 "\n"
 "Объединение отдельных PDF файлов.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr "Опции объедения:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2584,11 +2623,11 @@ msgstr ""
 "\n"
 "Перевернуть PDF.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr "Опции возврата:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
 msgid ""
 "file.pdf degrees\n"
 "\n"
@@ -2598,11 +2637,11 @@ msgstr ""
 "\n"
 "Повернуть по часовой стрелке страницы PDF файла.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr "Опции чередования:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2628,11 +2667,11 @@ msgstr ""
 "\n"
 "Разбить PDF файл.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr "Опции дробления:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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!"
@@ -2640,7 +2679,7 @@ msgstr ""
 "Единица измерения. По умолчанию дюйм. Варианты: %s Примечание: Данная "
 "установка не переопределит единицу измерения для полей!"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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"
@@ -2648,7 +2687,7 @@ msgstr ""
 "Размер страницы. Этот размер будет заходить друг на друга  если используется "
 "выходной профайл. По умолчанию формат letter. Выбрано %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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."
@@ -2657,26 +2696,26 @@ msgstr ""
 "`123x321` для указания ширины и высоты. Данная установка переопределяет "
 "любой определенный формат бумаги."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr "Орентация страницы. По умолчанию портретный. Выбрано %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr "Не могу найти pdftohtml, проверьте наличе по PATH"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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 "Укажите кодировку для создаваемого документа.  По умолчанию cp1252."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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"
@@ -2686,12 +2725,12 @@ msgstr ""
 "Преобразуйте его в HTML и попробуйте еще раз\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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 "Укажите кодировку для создаваемого документа.  По умолчанию utf-8."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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 "
@@ -2700,17 +2739,23 @@ msgstr ""
 "Укажите степень сжатия. По шкале от 1 до 10, где 1 это минимальное сжатие на "
 "высокой скорости, а 10 это максимальное сжатие на низкой скорости."
 
-#: /home/kovid/work/trunk/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/trunk/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 "Не вставлять Содержимое в резултирующий текст."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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'. "
@@ -2720,7 +2765,7 @@ msgstr ""
 "'old_mac' для совместимости с Mac OS 9 и раньше. Для Mac OS X используйте "
 "'unix'. 'system' будет использовать тип переноса по умолчанию для этой ОС."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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."
@@ -2728,7 +2773,7 @@ msgstr ""
 "Укажите кодировку для результирующего документа. По умолчанию utf-8. "
 "Примечание: Это параметр учитывают не все форматы."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2742,172 +2787,176 @@ msgstr ""
 "строке превысит указанное. Минимально возможное значение - 25 символов. "
 "Укажите 0 для запрета переноса строк."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr "Подтвердить перед удалением"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr "Размер иконок рабочей панели"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr "Геометрия основного окна"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr "Сортировать список эпилогов по популярности"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr "По умолчанию преобразование в LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr "Опции для просмотра электронной книги LRF"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "Показать обложку в отдельном окне вместо основного окна calibre"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 "Ограничить максимальное количество одновременных задач количеством "
 "процессоров CPU"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Скопирована"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Копировать"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Копирования в буфер обмена"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Выберите файлы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "Поиск"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Добавление..."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Ошибка пути"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr "Нет книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 "Книги не найдены"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Добавлена"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Ошибка при добавлении"
 
-#: /home/kovid/work/trunk/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."
@@ -2915,130 +2964,273 @@ msgstr ""
 "Добавление книг видимо зависло. Попробуйте перезапустить calibre и добавить "
 "книги меньшими порциями до тех пор пока не найдете проблемную книгу."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Есть повторения!"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Добавляем дубликаты ..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Сохранено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CVS/XML Параметры"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr "Поля для добавления к результату:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr "Параметры книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr "Каталог"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr "Префикс тэга дополнительной информации"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -3047,23 +3239,23 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr "Включить раздел 'Названия'"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr "Включить раздел 'Недавно добавленные'"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr "Сортировать числа как текст"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr "Шаблон вкладки для catalog.ui"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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 "
@@ -3073,112 +3265,112 @@ msgstr ""
 "сохраненные во время предыдущей конвертиции (если таковые есть) вместо "
 "значений по умолчанию указанных в основном окне настроек."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr "Массовое конвертирование"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr "Отключить обработку комиксов"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr "Отладка"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr "Отладка процесса преобразования."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr "Неверная папка отладки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr "Сбой создания папки отладки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -3191,47 +3383,7 @@ msgstr ""
 "подходящих значений параметров конвертирования, например таких как "
 "Содержание и Распознавание Глав."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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 "
@@ -3241,58 +3393,58 @@ msgstr ""
 "процесса конвертации. Этот HTML иногда может быть использован как хороший "
 "материал для ручного редактирования конвертации."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr "EPUB Вывод"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr "Не разделять по разрывам страниц"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr "Без &обложки по умолчанию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr "Разбивать файлы больше чем"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " кб"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr "FB2 Ввод"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr "Вывод FB2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr "Мастер масштабирования шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -3308,105 +3460,105 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr "&Выходной докумен"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr "Использовать &значения по умолчанию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr "&Входной документ"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr "Размер шрифта: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr " будут сопоставлены с размером: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr "0.0 пт"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr "Вид и функции"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr "&Отключить масштабирование шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr "Размер основного шрифта:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr "Высота строки:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr "Входная &кодировка:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr "Удалить пробелы между абзацами"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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. "
@@ -3416,189 +3568,189 @@ msgstr ""
 "устанавливает отступ абзацу, с тем чтобы абзацы можно было бы легко "
 "отличить. Этот параметр контролирует ширину этого отступа."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr "Линеаризировать таблицы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr "Вставить пустую строку"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr "Разделитель заголовка:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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>Ошибка при чтении файла:<br /><b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr "Использовать обложку из &исходного файла"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr "Сортировка Авторов"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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."
@@ -3606,441 +3758,445 @@ msgstr ""
 "Категория пометок книги.  Это поле обычно используется при поиске. "
 "<br><br>Вы можете разделить слова и фразы запятыми."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr "По умолчанию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr "Отключить сжатие содержимого файла"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "Настройка страницы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "Описание профиля"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr "Поля"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr "&Слева:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr "С&верху:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr "С&права:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr "С&низу:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr "&Формат:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr "Импорт PDF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr "Без изображений"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr "Ориентация:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 "Выберете для просмотра формат"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr "Открыть книгу"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr "Преобразовать"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr "Регулярное выражение для Заголовка:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr "Неправильное регулярное выражение"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr "Неправильное регулярное выражение: %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr "Пометить Главу"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr "Удалить первое &изображение"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr "Содержание"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Конечная Глава"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr "Максимальная длина строки:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr "*"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr "a"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr "br"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr "div"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr "h1"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr "h2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr "h3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr "h4"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr "h5"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr "h6"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr "hr"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr "span"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr "Со значением:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr "(Регулярное выражение)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -4050,345 +4206,406 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr "Устройство не подключено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr "Получить информацию о устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr "Получить список книг на устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr "Отправить метаданные в устройство"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr "Загружено %d книг на устройство"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr "Удалить книги из устройства"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr "Загрузить книги из устройства"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr "Смотреть книги на устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "и удалите из библиотеки"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr "Установить действие по умолчанию для \"отправить в устройство\""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr "Отправить email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr "Отправить в основную память"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr "Отправить на карту памяти A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr "Отправить на карту памяти B"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-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/trunk/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:412
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+msgid "Storage Card A"
+msgstr ""
 
-#: /home/kovid/work/trunk/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:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+msgid "Storage Card B"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr "Отослать выбранное"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr "Выберите формат для отправки в устройство"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr "Нет устройства"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr "Устройство не подсоединено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr "Нет карточки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr "Не могу передать: в устройстве нет карты памяти"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr "Прикреплено, Вы найдете e-book"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "от"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr "в %s формате."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr "Отправка email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr "Нет подходящего формата"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr "Книги не отправлены по email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr "Не отправлен email со следующими книгами:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr "Отослано email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr "Новости:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr "Прикреплено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr "Отослать новости"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr "Отправляются новости на устройство."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr "Отправка книги в устройство"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr "Нет места на устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Не могу загрузить книги на устройство из-за отсутствия свободной памяти. "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr "Использовать подкаталоги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "Путь"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "Форматы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr "&Предыдущий"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr "&Следующий"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "Выбрать формат"
 
-#: /home/kovid/work/trunk/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 "Установить конвертирование по умолчанию комиксов (файлы CBR/CBZ)"
 
-#: /home/kovid/work/trunk/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 "Установить опции конвертации  %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr "&Название:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr "&Автор(ы):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr "&Профиль:"
 
-#: /home/kovid/work/trunk/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 "%(plugin_type)s %(plugins)s"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
@@ -4396,11 +4613,11 @@ msgstr ""
 "Email\n"
 "Доставка"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
@@ -4408,23 +4625,23 @@ msgstr ""
 "Сервер\n"
 "Контента"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/trunk/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/trunk/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)."
@@ -4433,143 +4650,170 @@ msgstr ""
 "email<br>по этому адресу (в случае если имеется один из перечисленных "
 "форматов)."
 
-#: /home/kovid/work/trunk/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 "новый  email адрес"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "Ошибка"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "Неверный путь к плагинам"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s - неверный путь к плагинам"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Использовать плагин"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Плагин не может быть выключен"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "Плагин %s не может быть выключен"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Плагин не настраиваемый"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "Плагин: %s не требует настройки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Настроить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Не могу удалить встроеный плагин"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " не может быть удален. Это встроенный плагин. Попробуйте отключить его."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "Лог ошибок:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Лог доступа:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "Сбой запуска контент-сервера"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Неверный размер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Размер %s указан неверно. Должен быть задан в виде [ширина]x[высота]"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "Неправильное расположение базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "Неправильное расположение базы данных "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Должна быть дирректория."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Неправильное расположение базы данных.<br>Немогу записать "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr "Проверка целостности базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "Не удалось проверить целостность базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4577,32 +4821,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4613,106 +4857,106 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr "&Добавление книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr "Сохранить обложку отдельно"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr "Обновить метаданные в сохранённых копиях"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr "Сохранить метаданные в OPF файле"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr "Заменить пробелы подчёркиваниями"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr "Сохранение книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr "Пересылка на &устройство"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Настройки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr "Просмотреть расположение новой базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr "Сообщить о выходе &новой версии."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr "&Задержка сети по умолчанию:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -4720,153 +4964,169 @@ msgstr ""
 "Установить задержку по умолчанию для сетевых вызовов (т.е. в любое время вы "
 "выходите в интернет для получения информации)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " секунд"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr "Выбрать &язык (необходим рестарт):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "Обычный"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr "Высокий"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr "Низкий"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr "&Приоритет задачи"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr "Использовать &Римские цифры для нумерации"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr "использовать иконку в трее (необходим перезапуск)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr "Показывать уведомления в трее"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 "Показывать обложку в отдельном окне (нужен перезапуск)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "Поиск в процессе набора"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Отправлять автоматически закаченные новости в устройство для чтения"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Удалить новость из библиотеки, когда она автоматически попадает к читателю"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "Количество обложек показываемых в режиме просмотра (нужна перезагрузка "
 "calibre)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr "Большой"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr "Средний"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr "Маленький"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr "&Размер кнопок на панеле инструментов"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr "Показать надписи на кнопках панели инструментов"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr "Выбрать видимые &столбцы в просмотре библиотеки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Использовать внутренний вьювер для:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr "Добавить email адрес получателя"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "Добавить email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr "По умолчанию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr "Удалить email"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr "Проверка целостности базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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 "
@@ -4876,25 +5136,25 @@ msgstr ""
 "коллекции ваших книг из любой точки мира с помощью браузера. Любые изменения "
 "в настройках вступят в силу после перезапуска сервера."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "&Порт сервера:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -4902,7 +5162,7 @@ msgstr ""
 "Если вы не установили свой пароль, то кто угодно сможет получить доступ к "
 "вашим книгам через веб-интерфейс."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -4910,42 +5170,42 @@ msgstr ""
 "Максимальный размер ([ширина]x[высота]) обложек при отображении. Более "
 "крупные обложки подгоняются по размеру. "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "Макс. размер обложки:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "&Запустить сервер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr "Ост&ановить сервер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr "&Проверить сервер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr "Запустить сервер авт&оматически после загрузки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "Просмотреть логи &сервера"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4955,122 +5215,235 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 "Здесь можно настроить поведение Calibre, указав какие плагины он использует."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Включить/Выключить плагин"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr "Настроить плагин"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr "Удалить плагин"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr "Добавить новый плагин"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr "Файл плагина:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr "Добавить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "Дата"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr "Сохранить шаблон"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -5079,69 +5452,65 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr "Доступные переменные:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "Вы уверены?"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr "Показывать это предупреждение снова"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "Сортировка по Автору"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr "Поиск матаданных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr "Не могу найти матаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr "Не могу извлечь метаданные из:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr "Нет метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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 ""
 "Нет метаданных, попробуйте откорректировать заглавие и автора или ISBN ключ."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr "Получение метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -5153,74 +5522,69 @@ msgstr ""
 "href=\"http://www.isbndb.com\">бесплатный эккаунт</a> и прописать полученный "
 "ключ ниже."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr "Пароль доступа:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr "Получить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr "Совпадения"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr "Рабочее уточнение"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr "Активные работы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr "Остановить выбранную работу"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "Редактировать мета информацию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "Мета информация"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr "Автоматически выставить сортировку по автору"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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."
@@ -5228,55 +5592,55 @@ msgstr ""
 "Выставить, как автор(ы) этой книги будут отсортированы. Для примера Чарльз "
 "Дикенс будет сортироваться, как Дикенс, Чарлз."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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 "Оценка этой книги. 0-5 звезды"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr "Добавить теги: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr "Удалить тэги:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr "Удалить формат:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -5284,318 +5648,376 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "Книги"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "Не могу прочесть метаданные из %s формата"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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 "Не могу прочитать обложку из %s"
 
-#: /home/kovid/work/trunk/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 "Обложка в формате %s неправильная"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr "Загрузка обложки..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr "Не могу получить обложку"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Не могу получить обложку.</b><br/>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr "Таймаут загрузки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "Плохая обложка"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr "Обложка с неправильной картинкой"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr "Произошли ошибки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr "Не могу доставить метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "Нужно указаить ISBN, название, автора или издателя"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "ISBN"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "Загрузить обложку"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr "Необходим пароль"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr "Отмена..."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "%d дней, %d часов и %d минут назад"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr "Загрузить все запланированные задачи за раз"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr "Загрузить все задачи"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr "объявление"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr "Запланировано для загрузки:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "день"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "Понедельник"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "Среда"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "Четверг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "Пятница"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "Суббота"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr "в"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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."
@@ -5603,41 +6025,41 @@ msgstr ""
 "Промежуток в который будет загружаться этот набор. Значение ноль "
 "подразумевает загрузку каждый час."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr "&Учётная запись"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr "Для работы по расписанию, вы должны оставить calibre запущенным."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr "&Расписание"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr "Дополнительные теги:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr "&Дополнительно"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr "Загрузить сейчас"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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."
@@ -5645,19 +6067,19 @@ msgstr ""
 "Удалить загруженные новости, устаревшие через установленное количество дней. "
 "Для блокирования установите ноль."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr "Удалить закаченные новости старше, чем "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "содержит"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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."
@@ -5665,60 +6087,60 @@ msgstr ""
 "<p>Отрицательное значение. Что бы получить результат <b>не используйте</b> "
 "значение этого выражения."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr "Исключить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr "Ищется введеное значение..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr "Все эти слова:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr "Требуется фраза:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr "Одно или более из слов:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr "Но не показывать введеные данные..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr "Любые из этих найденных слов:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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"
@@ -5726,15 +6148,83 @@ msgstr ""
 "Смотри <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
 "interface\">Пользовательский мануал</a> для помощи"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
@@ -5742,15 +6232,15 @@ msgstr ""
 "Следующие теги применены к одной или нескольким книгам. Вы действительно "
 "хотите удалить их?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "Редактор тегов"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "Доступные теги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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."
@@ -5758,23 +6248,23 @@ msgstr ""
 "Удалить описание из базы данных. Описание не будет использоваться для всех "
 "книг и будет удалено из базы данных."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr "Добавить описание к текущей книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr "Примененные теги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr "Неприменять (удалить) описание из текущей книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr "Добавить описание:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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."
@@ -5782,135 +6272,195 @@ msgstr ""
 "Если желаемый тег отсутствует в списке, Вы можете добавить его здесь. "
 "Используйте запятую для разделения нескольких тегов."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr "Отправить пробное сообщение от %s к:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr "Нет выбранных параметров"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
 msgid "The attached file: %s is a recipe to download %s."
 msgstr "Присоединенный файл: %s как параметр загружаемый %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr "Параметры для "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr "Поле должно быть заголовком"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr "Поле должно быть заголовком"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr "Поле должно иметь URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr "Поле %s должно иметь URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr "Уже существует"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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>Не могу создать параметр. Ошибка:<br> %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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 "Выбранное имя параметра %s уже существует. Хотите заменить его?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr "Подобрать параметр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr "Подобрать параметр выборочно"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr "Выбрать файл параметра"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr "Добавить  источник новостей"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr "Доступные пользователю параметры"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr "Добавить/Обновить параметры"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr "Удалить параметры"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr "Совместный параметр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr "Настроить встроенный параметр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr "Загрузить параметр из файла"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5933,52 +6483,52 @@ msgstr ""
 "новостей, добавляемых в RSS ленту.<br />Для большинства лент, вы можете "
 "использовать для просесса загрузки \"Расширенный режим\".</p></body></html>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr "Параметр заголовка"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr "Старая статья:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr "Загружена старая статья"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr "Максимальное количество статей в ленте:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr "Поля в параметре"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr "Удалить поле из параметра"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr "Поле заглавия:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr "&Адрес ленты новостей:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr "Добавить ленту"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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>"
@@ -5988,11 +6538,11 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">Пользовательские"
 " Параметры</a>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr "Параметр кода источника (python)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -6016,146 +6566,232 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr "Регулярное &выражение"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr "Имя файла:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Обычный параметр (?P&lt;title&gt;)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr "Нет совпадений"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr "Авторы:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr "Регулярное выражение (?P<author>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr "Серия:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr "Обычный параметр (?P<series>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr "Индекс серии:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr "Обычный параметр (?P<series_index>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr "Обычный параметр (?P<isbn>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr "Задание"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "Статус"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "Ход выполнения"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr "Рабочее время"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr "Неизвестная работа"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr "Немогу удалить задание"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Немогу удалить задание при подключенном устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr "Задание уже запущено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr "Недоступен"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr " - Работы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "Размер (МБ)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "Ничего"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Книга <font face=\"serif\">%s</font> из %s."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr "Формат"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+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
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Запрещено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6163,359 +6799,376 @@ msgstr ""
 "Сброс на устройство не поддерживается. Сначала добавьте книгу в библиотеку "
 "calibre."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "Формат"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr "Дважды кликните по <b>редактировать</b><br><br>"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr "Настройка просмотрщика"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr "Использовать белый фон"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr "Перенести"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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>Изменения применятся только после перезагрузки.</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr " - LRF просмотрщик"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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>Нет совпадений</b> для искомой фразы <i>%s</i> ."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr "LRF просмотрщик"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr "Разбор файла LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr "Панель промотра LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr "Следующий подбор"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr "Настроить"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Плохое расположение базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s уже запущен."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "попробуйте перезагрузить ваш компьютер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "попробуйте удалить файл"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "Расширенный поиск"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "&Поиск:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr "Сброс быстрого поиска"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "Сортировать по &популярности"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr "Сравнить некоторые"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr "Сравнить все"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "Добавить книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "Удалить книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "Редактировать мета информацию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "Отправить в устройство"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "Сохранить на диск"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "Скачать новости"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "Конвертировать"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Вид"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "Открыть папку"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "Показать подробности"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "Книги этого же автора"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "Книги той же серии"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr "Книги того же издателя"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "Книги с такими же тегами"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr "Конфигурация Calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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."
@@ -6524,248 +7177,290 @@ msgstr ""
 "stderr).Полезно для windows, где графические приложения не имеют потоков "
 "вывода."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr "&Параметры"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr "&Выход"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr "ОШИБКА: Необработанное исключение"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr "У книги нет ни названия, ни ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr "Нет совпадений в этой книге"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "Найти"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /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/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr "Работа:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr "Кликнуть для просмотра списка активных задач"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
-msgstr "Кликнуть для просмотра книг по обложкам"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr "Кликнуть для выключения просмотра книг по обложкам"
-
-#: /home/kovid/work/trunk/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/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
-"<p>Просмотра книг по обложкам выключен.<br>Импорт модуля pictureflow "
-"неудачен:<br>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
-msgstr "Кликнуть для просмотра книг по тегам"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "Авторы"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Hide Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "Публикация"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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 "Конвертация книги %d из %d (%s)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr "Выбрать новости из "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr "Сохранить единый формат диска..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr "Ошибка подключения с устройством"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "Восстановить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "Пожертвовать на развитие calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Перезапуск"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 "<p>Для получения справки см.:<a href=\"%s\">Руководство пользователя </><br>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr "Редактировать метаданные индивидуально"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr "Редактировать основные метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr "Загрузить метаданные и обложки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr "Загрузить только метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr "Загрузить только обложки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr "Загрузить только социальные метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr "Добавить книги из одной директории"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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)"
@@ -6774,7 +7469,7 @@ msgstr ""
 "директорию, считая, что каждый файл в директории - та же самая книга в "
 "разных форматах)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:297
+#: /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)"
@@ -6782,93 +7477,105 @@ msgstr ""
 "Добавить книги из директорий, включая поддиректории (одна книга на "
 "директорию, считая, что каждый файл - отдельная книга)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Добавить пустую книгу (книга без каких-либо форматов)."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr "Сохранить на диск в одну директорию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 "Сохранять на диск только формат %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr "Просмотреть особый формат"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr "Удалить выбранные книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr "Удалить файлы определенного формата из выбранных книг."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr "Удалить все форматы из выбранных книг, исключая..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr "Удаление обложки с выбранных книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr "Индивидуальное преобразование"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr "Общее преобразование"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr "Создать каталог книг в вашей библиотеке \"calibre\""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr "Запустить начальный мастер настройки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr "Похожие книги..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Просмотр по обложкам"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Устройство: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " определено."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Подключено "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "База данных устройства неисправна"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6898,148 +7605,148 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 "Нет Выбранных книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 "Загрузка книг в устройство."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "Книги EPUB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "Книги LRF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "Книги HTML"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "Книги LIT"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "Книги MOBI"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Текстовые книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "Книги PDF"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Комиксы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Архивы"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Сбой чтения метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 "Нет выбранных книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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?"
@@ -7047,57 +7754,63 @@ msgstr ""
 "Выбранные книги будут <b>навсегда удалены</b> вместе с файлами с Вашего "
 "компьютера. Вы уверены?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Удаляются книги из устройства."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Не удалось загрузить метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "обложек"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Загрузка %s для %d книг(и)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Не удалось загрузить некоторые метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Не удалось загрузить метаданные:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 "Невозможно редактировать метаданные"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -7105,7 +7818,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -7115,93 +7828,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Невозможно сохранить на диск"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Выберете директорию получателя"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Ошибка при сохранении"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "Произошла ошибка при сохранении."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 "Не удалось сохранить некоторые книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Вызвать новость из "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " загружено."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Не преобразуется"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "Невозможно просмотреть"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr "Не могу открыть папку"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Выбраны несколько книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -7209,31 +7918,44 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr "Не могу открыть папку"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s неизвестный формат."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Невозможно настроить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr "Пока запущено задание, не могу настроить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Нет доступной подробной информации"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr "Не доступна подробная информация книг на устройстве"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Ошибка согласования устройства"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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."
@@ -7241,26 +7963,26 @@ msgstr ""
 "Была временная ошибка общения с устройством. Пожалуста, переподключите "
 "устройство или перегрузите его."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Ошибка преобразования"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -7268,22 +7990,22 @@ msgstr ""
 "является результато труда многих добровольцев по всему миру. Если Вы сочли "
 "его полезным, будьте добры пожертвовать на его развитие."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Имеется активное задание. Вы все равно хотите выйти?"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Активные задания"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -7291,7 +8013,7 @@ msgstr ""
 "продолжит работать в трее. Для завершения работы выберите<b>Quit</b> в "
 "контекстном меню трея."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -7299,135 +8021,135 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Последняя версия: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Доступно обновление"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr "Редактировать закладку"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr "Новое название закладки:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr "Экспорт закладок"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr "Сохранённые закладки (*.pickle)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr "Импортировать закладки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr "*.pickle закладки."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr "Название"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr "Управление закладками"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr "Действия"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr "Изменить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr "Удалить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr "Сбросить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr "Экспорт"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr "Импорт"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr "Настройка просмоторщика Ebook"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr "&Опции шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr "Cемейство Se&rif:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr "Cемейство &Sans:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr "Cемейство &Monospace:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr "Размер шрифта &по умолчанию"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr "Monospace &размер шрифта:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr "С&тандартный шрифт:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr "Serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr "Sans-serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr "Моноширный"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr "Запомнить последний раз использованный &window размер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr "Максимум &view ширина:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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."
@@ -7435,355 +8157,355 @@ msgstr ""
 "Язык по умолчанию для использования правил переноса. Будет использован, если "
 "для данной книги не установлен язык."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr "Язык по умолчанию для переносов:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr "Пользовательский стиль"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr "&Общие"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr "Не найдено ничего для:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr "Опции настроек ebook вьювера"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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 ""
 "Настройка CSS. Может быть использовано для изменения вида всем книгам."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr "Максимальная ширина для окна просмотра, в пикселях."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr "Текст, разделённый дифисом"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr "Параметры шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr "Шрифты семейства serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr "Шрифты семейства sans-serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr "Шрифты семейства monospaced"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr "Размер Стандартного шрифта в px"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr "Размер Моноширного шрифта в px"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr "Стандартный шрифт"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr "Позиция в книге"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr "Поиск текста в книге"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr "Предварительный просмотр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr "Выбрать электронную книгу"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr "Электронная книга"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr "Добавить закладку"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr "Введите название закладки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr "Нет соответствий для: %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr "Загрузить поток..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr "Разметка %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr "Управление закладками"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr "Загружается электронная книга..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr "Ошибка DRM"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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>Книга защищена <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr "Не могу открыть электронную книгу"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr "Опции управления ebook вьювером"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr "Тулбар"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr "Большой размер шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr "Маленький размер шрифта"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr "Найти следующее"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr "Справочный режим"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr "Закладка"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr "В полный экран"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr "Печать"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr "Печать книги"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
@@ -7793,7 +8515,7 @@ msgstr ""
 "%d\n"
 "книг"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
@@ -7803,7 +8525,7 @@ msgstr ""
 "%s\n"
 "доступно"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
@@ -7813,7 +8535,7 @@ msgstr ""
 "%s\n"
 "доступна"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
@@ -7823,146 +8545,143 @@ msgstr ""
 "%s\n"
 "доступна"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr "Нажмите, чтобы посмотреть книги имеющиеся на вашем компьютере"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr "Нажмите, чтобы посмотреть книги в основной памяти читалки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr "Нажмите, чтобы посмотреть книги на карте памяти A читалки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr "Нажмите, чтобы посмотреть книги на карте памяти B читалки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr "Изменить регистр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr "Верхний регистр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr "Нижний регистр"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr "Неверная база данных"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr "Производители"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr "&Устройства"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7971,71 +8690,71 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr "&Kindle email:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr "Выберите ваш язык:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr "&Изменить"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
 msgstr "Использование: %s:%s@%s:%s и %s шифрование"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr "Отправка..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr "Сообщение успешно отправлено"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr "Закончить установку gmail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr "Нужно указать From email адрес"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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 "Нжно указать имя пользователя и пароль для email сервера"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr "Отослать email &from:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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"
@@ -8043,7 +8762,7 @@ msgstr ""
 "<p>То, что будет указано в поле From:  письма, отсылаемого calibre.<br> "
 "Проставьте Ваш email адрес"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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."
@@ -8051,75 +8770,75 @@ msgstr ""
 "<p>Почтовый сервер полезен в случае, если сервис, через который Вы отсылаете "
 "почту, принимает почту от известных почтовиков."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr "Почтовый сервер"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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 может <b>опционально</b> использовать почтовый сервер для отправки"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr "Имя хоста:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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 "TИмя хоста почтового сервера. Напимер smtp.gmail.com"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr "Порт"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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 "Порт, на котором слушает почтовый сервер. По умолчанию 25"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr "Имя пользователя на почтовом сервере"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr "Пароль на почтовом сервере"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr "Показать"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr "Шифрование"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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 "Использовать TLS при соединении с почтовым сервером."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr "TLS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
 msgid "Use SSL encryption when connecting to the mail server."
 msgstr "Использовать SSL  при соединении с почтовым сервером."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr "SSL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr "Использовать Gmail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr "&Тестовое письмо"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -8127,45 +8846,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
-msgstr "Установки управления сервером calibre"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
-msgstr "Порт. По умолчанию %default"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
-msgstr "Таймаут в секундах. По умолчанию %default"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:16
-msgid "The max number of worker threads to use. Default is %default"
-msgstr "Максимальное количество используемых нитей. По умолчанию %default"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
-msgstr "Пароль ограниченного доступа. По умолчанию доступ неограничен."
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
-msgstr "Имя пользователя. По умолчанию: %default"
-
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
-msgstr "Максимальный размер демонстрируемой обложки. По умолчанию: %default"
-
-#: /home/kovid/work/trunk/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:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:259
+msgid "yesterday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -8174,7 +8904,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -8182,14 +8912,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -8198,14 +8928,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8214,28 +8944,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8244,7 +8974,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -8254,21 +8984,21 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 "Путь к библиотеки Calibre. По умолчаниюиспользовать путь в установках."
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
@@ -8278,7 +9008,7 @@ msgstr ""
 "\n"
 "Список книг в базе данных Calibre.\n"
 
-#: /home/kovid/work/trunk/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"
@@ -8292,7 +9022,7 @@ msgstr ""
 "По умолчанию: %%default. Спецполе \"all\" можно использовать для выбора всех "
 "полей. Эффективно только для текстового формата."
 
-#: /home/kovid/work/trunk/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"
@@ -8302,11 +9032,11 @@ msgstr ""
 "Доступные поля: %s\n"
 "По умолчанию: %%default"
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -8316,17 +9046,17 @@ msgstr ""
 "соответствующей документации в руководстве пользователя. По умолчанию не "
 "фильтровать."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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."
@@ -8334,21 +9064,15 @@ msgstr ""
 "Префикс для всех путей. По умолчанию это абсолютный путь к директории "
 "библиотеки."
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr "Формат вывода данных. Возможный выбор: %s. По умолчанию text."
-
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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):"
@@ -8356,7 +9080,7 @@ msgstr ""
 "Следующие книги не добавлены, поскольку они уже есть в базе данных (см. "
 "опцию --duplicates):"
 
-#: /home/kovid/work/trunk/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"
@@ -8370,7 +9094,7 @@ msgstr ""
 "директории, смотри\n"
 "опции директории ниже.\n"
 
-#: /home/kovid/work/trunk/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"
@@ -8378,11 +9102,11 @@ msgstr ""
 "Считать, что в каждой директории есть только одна логическая книга в "
 "различных e-book форматах"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr "Обрабатывать рекурсивно"
 
-#: /home/kovid/work/trunk/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."
@@ -8390,27 +9114,27 @@ msgstr ""
 "Добавлять книгу в базу данных даже если она уже есть. Сравнение основано на "
 "названиях книг."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8424,11 +9148,11 @@ msgstr ""
 "запятой номеров id (id номера можно получить командой list ). Например, "
 "23,34,57-85\n"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8442,15 +9166,15 @@ msgstr ""
 "ebook идентифецирована по id. id можно получить командой list. Если книга в "
 "данном формате уже есть, она будет заменена.\n"
 
-#: /home/kovid/work/trunk/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 "Вы должны указать id и файл электронной книги"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8466,11 +9190,11 @@ msgstr ""
 "получить id используя команду list. fmt это расширения файла LRF или TXT или "
 "EPUB. Если logical book не имеет нужного fmt, ничего не произойдет.\n"
 
-#: /home/kovid/work/trunk/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 "Вы должны указать id и формат"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8485,15 +9209,15 @@ msgstr ""
 "Показать метаданные из базы данных calibre для книги с id.\n"
 "id это номер из команды list.\n"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr "Напечатать метаданные в OPF из (XML)"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr "Вы должны назначить id"
 
-#: /home/kovid/work/trunk/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"
@@ -8513,11 +9237,11 @@ msgstr ""
 "можете быстро заполнить OPF формат используя --as-opf опцию для\n"
 "команды show_metadata.\n"
 
-#: /home/kovid/work/trunk/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 "Вы должны указать id и файл метаданных"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8534,27 +9258,27 @@ msgstr ""
 "Операция экспорта сохраняет все форматы книги, ее обложку и метаданные (в\n"
 "opf файле). id можно получить командой list.\n"
 
-#: /home/kovid/work/trunk/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 "Передать все книги в базу данных, игнорируя список ids."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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 "Вы должны указать id или опцию %s"
 
-#: /home/kovid/work/trunk/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"
@@ -8565,23 +9289,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8592,30 +9316,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Показать детальную информацию. Используется для отладки."
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8627,17 +9351,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8646,19 +9370,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8668,15 +9392,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8696,111 +9420,127 @@ msgstr ""
 "\n"
 "Для справки: %%prog команда --help\n"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Миграция старой базы данных в %s<br><center>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Копирование <b>%s</b>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Сжатие базы данных"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr "Авторы"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr "Теги"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr "Серии"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr "Рейтинг"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr "Издатель"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr "Дата"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr "Дата публикации"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8808,7 +9548,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8816,7 +9556,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8824,29 +9564,63 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "Установки управления сервером calibre"
+
+#: /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 "Таймаут в секундах. По умолчанию %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 "Максимальное количество используемых нитей. По умолчанию %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 "Имя пользователя. По умолчанию: %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr "Максимальный размер демонстрируемой обложки. По умолчанию: %default"
+
+#: /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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr "Пароль для доступа в библиотеку. Имя пользователя "
 
-#: /home/kovid/work/trunk/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
@@ -8856,215 +9630,259 @@ msgstr ""
 "\n"
 "Запуск calibre content server."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr "%sИсп.%s: %s\n"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr "Создано "
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr "Ключ доступа к isbndb.com"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr "Закончил"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr "Португальский (Бразилия)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr "Английский (Великобритания)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr "Упрощённый китайский"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr "Китайский (Гонконг)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr "Английский"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr "Английский (Пакистан)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr "Английский (Сингапур)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr "URL должен быть sftp scheme"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr "хост доллжен быть задан в форме user@hostname"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr "Проблемы с открытием SSH сессии: "
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr "Ошибка авторизации на сервере: %s"
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr "Контроль email доставки"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr "Неизвестная заготовка"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "Безымянная статья"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr "Скачивание периодического контента из Интернета"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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."
@@ -9072,131 +9890,131 @@ msgstr ""
 "Полезно при обработке доставки. Устанавливает max_articles_per_feed равным 2 "
 "и загружает максимум 2 подписки."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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 "Не загружать последнюю версию встроенных рецептов с сервера calibre"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr "Неизвестный новостной ресурс"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Рецепт \"%s\" требует имя пользожателя и пароль"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Закачка завершена"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "Неудачная загрузка следующих статей:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr "Неудачная загрузка частей следующих статей:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " из "
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tБитые ссылки:"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Не может быть вызвана статья. Запустите с -w чтобы увидеть причину."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Вызываются заготовки..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "Получить заготовки для оглавления"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Попытка скачать обложку..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Создаем титульные данные..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Начало загрузки [%d поток(и)]..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Заготовки закачиватся в %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Невозможно скачать обложку: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Скачивается обложка из %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "Выходные данные изображения загрузили"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Статья без названия"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Статья скачена: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Ошибка загрузки статьи: %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Доставляется материал"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr "Вы"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -9206,19 +10024,19 @@ msgstr ""
 "\n"
 "Где URL на пример http://google.com"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Основная директория, в которую сохранятся URL. По умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 "Максимальное время ожидания ответа от сервера. По умолчанию: %default с"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -9226,7 +10044,7 @@ msgstr ""
 "Максимально число уровней вложения, т.е. глубина последовательных ссылок. По "
 "умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -9234,7 +10052,7 @@ msgstr ""
 "Максимальное количество файлов для скачивания. Применимо только к файлам из "
 "тегов <a href>. По умолчанию: %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -9242,7 +10060,7 @@ msgstr ""
 "Минимальный интервал в секундах между последовательными вызовами. По "
 "умолчанию: %default с"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -9250,7 +10068,7 @@ msgstr ""
 "Кодировка вебсайтов, которые вы собираетесь скачивать. По умолчанию делается "
 "попытка определения кодировки."
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -9261,7 +10079,7 @@ msgstr ""
 "скачиваться тогда, когда она совпадет хотя бы с одним из регулярных "
 "выражений. По умолчанию, никакие ссылки не скачиваются."
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -9275,7 +10093,7 @@ msgstr ""
 "умолчанию, ссылки не отклоняются. Если указаны обе опции --filter-regexp и --"
 "match-regexp, то вначале будет учитываться --filter-regexp."
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Не скачивать файлы стилей CSS."
 
@@ -10339,6 +11157,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Regular expression (?P<authors>)"
 #~ msgstr "Обычный параметр (?P<authors>)"
 
+#~ msgid "and delete from library"
+#~ msgstr "и удалите из библиотеки"
+
 #~ msgid "Set defaults for conversion of comics"
 #~ msgstr "Настройки по умолчанию для преобразования комиксов"
 
@@ -10822,6 +11643,19 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ "Использовать список книг по названию, автору, издателю, тэгам и "
 #~ "комментариям<br><br>Слова разделены пробелами и объединены AND"
 
+#~ msgid "Click to browse books by their covers"
+#~ msgstr "Кликнуть для просмотра книг по обложкам"
+
+#~ msgid "Click to turn off Cover Browsing"
+#~ msgstr "Кликнуть для выключения просмотра книг по обложкам"
+
+#~ msgid ""
+#~ "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+#~ "module failed:<br>"
+#~ msgstr ""
+#~ "<p>Просмотра книг по обложкам выключен.<br>Импорт модуля pictureflow "
+#~ "неудачен:<br>"
+
 #~ msgid "Convert book: "
 #~ msgstr "Конвертировать книгу: "
 
@@ -10859,6 +11693,11 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Click to see the list of books on the storage card in your reader"
 #~ msgstr "Кликните чтобы посмотреть список книг на карточке"
 
+#~ msgid ""
+#~ "The format in which to output the data. Available choices: %s. Defaults is "
+#~ "text."
+#~ msgstr "Формат вывода данных. Возможный выбор: %s. По умолчанию text."
+
 #~ msgid "Create file names as author - title instead of title - author"
 #~ msgstr "Имена файлов автор - имя книги, а не имя книги - автор"
 
@@ -10962,6 +11801,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Send specific format to storage card"
 #~ msgstr "Отослать определенный формат на карточку"
 
+#~ msgid "Send specific format to main memory"
+#~ msgstr "Отослать определенный формат в устройство"
+
 #~ msgid ""
 #~ "Could not email the following books as no suitable formats were "
 #~ "found:<br><ul>%s</ul>"
@@ -11156,6 +11998,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Communicate with the Sony PRS-300/505 eBook reader."
 #~ msgstr "Соединяться с Sony PRS-300/505"
 
+#~ msgid "Click to browse books by tags"
+#~ msgstr "Кликнуть для просмотра книг по тегам"
+
 #~ msgid "English (AU)"
 #~ msgstr "Английский (Австралия)"
 
@@ -11193,6 +12038,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Communicate with the Sony PRS-600/700 eBook reader."
 #~ msgstr "Соединяться с Sony PRS-600/700."
 
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "Соединяться с Sony PRS-300/505/500."
+
 #~ 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 "
@@ -11215,5 +12063,14 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgstr ""
 #~ "Кодировка входных символов. По умолчанию используется автоопределение."
 
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Соединяться с Sony PRS-600/700/900"
+
+#~ msgid "Send specific format to storage card B"
+#~ msgstr "Отправить определённый формат на карту памяти B"
+
+#~ msgid "Send specific format to storage card A"
+#~ msgstr "Отправить определённый формат на карту памяти A"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "Транслитерировать Unicode символы в ASCII."
diff --git a/src/calibre/translations/sq.po b/src/calibre/translations/sq.po
index 3328e24d52..5de65978d8 100644
--- a/src/calibre/translations/sq.po
+++ b/src/calibre/translations/sq.po
@@ -7,236 +7,236 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:22+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:37+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-05-30 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -244,159 +244,159 @@ msgid ""
 "encoding declarations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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/trunk/src/calibre/customize/profiles.py:69
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 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/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -404,528 +404,567 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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/trunk/src/calibre/devices/cybook/driver.py:22
+#: /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/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
+#: /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/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /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:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+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:29
+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/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:89
-msgid "Getting list of books on device..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
+msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "Lajme"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Formësoni Pajisjen"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "Përshtatje Ekstra"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "Merr të dhëna paisjeje..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+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/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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 "Faqe"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -951,65 +990,65 @@ msgid ""
 "For full documentation of the conversion system see\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1017,7 +1056,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1025,7 +1064,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1033,7 +1072,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1042,17 +1081,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1060,58 +1099,58 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1121,7 +1160,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1129,39 +1168,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1170,73 +1209,73 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1246,7 +1285,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1256,111 +1295,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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 "Caktoni titullin"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1369,21 +1408,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1391,7 +1430,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1400,42 +1439,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1443,152 +1482,152 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /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/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1597,159 +1636,163 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "Titull"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "Autor(ë)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "Botues"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "Komente"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "Etiketa"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "Seri"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "Gjuhë"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "Vulë kohore"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "Botuar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "Të drejta"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr "mundësi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1763,120 +1806,120 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "etiketa"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
 msgstr "përshkrime/recensione"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr "Shkarkoje %s prej %s"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1890,41 +1933,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -1932,166 +1975,162 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Kapak"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "Krejt artikujt"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr "Faqe Titulli"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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 "Tryeza e Lëndës"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr "Tregues"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "Bibliografi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "Të drejta kopjimi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
 msgid "List of Illustrations"
 msgstr "Listë e ilustrimeve"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 msgid "List of Tables"
 msgstr "Listë Tabelash"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "Shënime"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Main Text"
 msgstr "Teksti Kryesor"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr "Mbështjellëse Libri"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr "Poshtëshënime"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr "Anështyllë"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2099,32 +2138,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2136,114 +2175,114 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2252,33 +2291,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2293,90 +2332,96 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2384,296 +2429,443 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Gabim shtegu"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2682,135 +2874,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2818,105 +3010,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " KB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -2932,732 +3084,736 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr " em"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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 "Tejtëdhëna"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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 "Zgjidhni kapak për "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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 "Nuk keni leje të lexoni kartelën: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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 "Gabim në leximin e kartelës"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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 "Kapak Libri"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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 "&Titull: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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 "&Botues: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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 "Libër "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr "*"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr "br"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr "div"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr "h1"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr "hr"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr "span"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3667,517 +3823,605 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr "Pa pajisje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "E-libër:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr "Lajme:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "Shteg"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "Formate"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr "&E mëparshmja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr "&Pasuesja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "Zgjidhni Format"
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr "&Titull:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr "&Autor(ë):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr "&Profil:"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "plugins"
 msgstr "shtojca"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Conversion"
 msgstr "Shndërrim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "General"
 msgstr "Të përgjithshme"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:199
 msgid "Interface"
 msgstr "Ndërfaqe"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Plugins"
 msgstr "Shtojca"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:219
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "Gabim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Zgjidhni shtojcë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Personalizojeni"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "Regjistrim gabimesh:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Madhësi e pavlefshme"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4185,32 +4429,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4221,327 +4465,343 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " sekonda"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Panel"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4551,121 +4811,234 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr "Gjedhe e  pavlefshme"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr "Gjedhja %s është e pavlefshme:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4674,68 +5047,64 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "GABIM"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr "Sinjalizim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4743,128 +5112,123 @@ msgid ""
 "below."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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 " yje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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 "Hap Përpunuesin e Etiketave"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -4872,615 +5236,801 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "Libra"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr "Shkarkimit i mbaroi koha."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "Kapak i Prishur"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr "Kapaku s'është pamje e vlefshme"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr "Pati gabime"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr "Leje e mohuar"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "dd MMM yyyy"
 
-#: /home/kovid/work/trunk/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 "&Datë:"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr "Lypset fjalëkalim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
 msgid "Created by: "
 msgstr "Krijuar prej: "
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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 "Çdo "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "ditë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "të Hënë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "të Martë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "të Mërkurë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "të Enjte"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "të Premte"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "të Shtunë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "të Dielë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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 " ditë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr "&Llogari"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "përmban"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr "Zgjidhni formate"
 
-#: /home/kovid/work/trunk/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:72
+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
+msgid "Publishers"
+msgstr "Botuesa"
+
+#: /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 "Jeni i sigurt?"
 
-#: /home/kovid/work/trunk/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?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "Përpunues Etiketash"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr "Zbatoje etiketën te libri i tanishëm"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5494,62 +6044,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5573,846 +6123,1005 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr "Titull:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr "Autorë:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "Gjendje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "Përparim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "Vlerësim"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "Asnjë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /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
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "Format"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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 "Nuk u gjetën përputhje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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 "Faqja Pasuese"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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 "Faqja e Mëparshme"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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 "Mbrapsht"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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 "Përpara"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr "Përputhja pasuese"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr "Formësoni"
 
-#: /home/kovid/work/trunk/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 "Përdor biblioteknë e treguar te shtegu i dhënë."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
 msgstr "Mos kontrollo për përditësime"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "Kërkim i thelluar"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "&Kërko:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "Shtoni libra"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr "S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "Hiqni libra"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "Përpunoni të dhëna meta"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr "P"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "Dërgoje te pajisja"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "Ruaje në disk"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr "R"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "Bjer lajme"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr "B"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "Shndërro E-libra"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr "N"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Shfaqje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr "q"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "Hap dosjen mëmë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "Shfaq hollësi libri"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "Libra nga po ai autor"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "Libra në këtë seri"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr "Libra nga ky botues"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "Libra me të njëjtat etiketa"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr "Formësoni calibre-in"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr "&Parapëlqime"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr "&Mbylle"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid " or "
 msgstr " ose "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
 msgid "&Default"
 msgstr "&Parazgjedhje"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr "Kornizë"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/sidebar.py:84
+msgid "Hide Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "Autorë"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "Botuesa"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Pajisje: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6428,204 +7137,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6633,7 +7348,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6643,93 +7358,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6737,735 +7448,745 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7474,150 +8195,150 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7625,45 +8346,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7672,7 +8404,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7680,14 +8412,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7696,14 +8428,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7712,28 +8444,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7742,7 +8474,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7752,27 +8484,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7781,61 +8513,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7844,43 +8570,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7889,11 +8615,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7902,15 +8628,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7920,11 +8646,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -7934,15 +8660,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7955,11 +8681,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -7970,27 +8696,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8001,23 +8727,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8028,30 +8754,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8063,17 +8789,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8082,19 +8808,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8104,15 +8830,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8124,111 +8850,127 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8236,7 +8978,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8244,7 +8986,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8252,422 +8994,500 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8676,6 +9496,6 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr ""
diff --git a/src/calibre/translations/sr.po b/src/calibre/translations/sr.po
index a172d94604..932d38632c 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-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-06-01 13:44+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-05 09:26+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-02 03:31+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -70,9 +70,9 @@ msgstr "Ne radi baš ništa"
 #: /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,8 +100,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -121,18 +121,18 @@ msgstr "Ne radi baš ništa"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -158,11 +158,11 @@ msgstr "Tip fajla"
 msgid "Metadata reader"
 msgstr "Čitač metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Pisač metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Generator kataloga"
 
@@ -280,7 +280,7 @@ msgstr ""
 "je ako ne znate ništa o ulaznom dokumentu."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 "Ovaj profil je namenjen SONY PRS čitačima 500/505/600/700 i drugima."
@@ -290,62 +290,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Ovaj profil je namenjen B&N Nook čitaču."
 
@@ -363,24 +363,24 @@ msgstr ""
 "je ako želite da proizvedete dokument koji može da se čita kako na računaru, "
 "tako i na različitim čitačima."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr "Namenjeno za iPad i slične uređaje sa rezolucijom 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
 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:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 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:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -388,7 +388,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:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ovaj profil je namenjen Amazon Kindle DX čitaču."
 
@@ -474,33 +474,33 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Uspostavi komunikaciju sa S60 telefonima"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 msgid "Communicate with iBooks through iTunes."
 msgstr "Uspostavi komunikaciju sa iBooks preko iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 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:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
 msgstr "Ažuriram spisak metapodataka na uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d od %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "završeno"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -510,17 +510,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:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /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:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -763,7 +763,7 @@ msgstr "Nema dovoljno mesta na memorijskoj kartici"
 #: /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:1178
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1284
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:120
 msgid "News"
 msgstr "Vesti"
@@ -1993,7 +1993,7 @@ msgid "Comments"
 msgstr "Komentari"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2003,7 +2003,7 @@ msgid "Tags"
 msgstr "Etikete"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2268,7 +2268,7 @@ msgstr ""
 "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/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Naslovna strana"
 
@@ -2311,70 +2311,70 @@ msgstr "Svi članci"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Ovo je Amazon Topaz knjiga. Nju nije moguće obraditi."
 
-#: /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 "Naslovna strana"
 
-#: /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 "Sadržaj"
 
-#: /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 "Indeks"
 
-#: /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 "Pojmovnik"
 
-#: /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 "Zahvalnosti"
 
-#: /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 "Bibliografija"
 
-#: /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 "Impresum"
 
-#: /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 "Autorska prava"
 
-#: /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 "Posveta"
 
-#: /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 "Epigraf"
 
-#: /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 "Predgovor"
 
-#: /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 "Spisak ilustracija"
 
-#: /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 "Spisak tabela"
 
-#: /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 "Beleške"
 
-#: /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 "Predgovor"
 
-#: /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 "Glavni tekst"
 
@@ -2930,20 +2930,24 @@ msgstr "Prepiši ime autora i naslov novim metapodacima"
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Ograniči najveći broj poslova na broj procesora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+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/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopirano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Kopiraj u memoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Izaberi fajlove"
 
@@ -2951,41 +2955,41 @@ msgstr "Izaberi fajlove"
 msgid "Searching in"
 msgstr "Tražim u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Dodajem..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr "Tražim u svim pod-direktorijumima..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Greška u putanji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 msgid "The specified directory could not be processed."
 msgstr "Nisam mogao da obradim navedeni direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Nema knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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 "Nije nađena nijedna knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Dodato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Dodavanje nije uspelo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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."
@@ -2994,26 +2998,26 @@ msgstr ""
 "dodajete knjige u manjim grupama sve dok ne pronađete knjigu koja pravi "
 "problem."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Pronađeni su duplikati!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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 ""
 "Knjige sa istim naslovom već postoje u bazi podataka. Da ih ipak dodam?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Dodajem duplikate..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Snimam..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Snimljeno"
 
@@ -3111,15 +3115,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -3128,6 +3132,8 @@ msgstr ""
 #: /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
@@ -3136,6 +3142,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/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
@@ -3246,8 +3254,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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -3965,22 +3973,22 @@ msgstr "Sačuvaj r&azmere naslovne strane"
 msgid "RB Output"
 msgstr "RB izlaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
+#: /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 "Izaberite format za prikaz"
 
-#: /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 ""
 "Ne mogu da odredim regularni izraz korišćenjem samo korisničkog interfejsa "
 "bez knjige"
 
-#: /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 "Nijedan format nije na raspolaganju"
 
-#: /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 "Otvori knjigu"
 
@@ -4735,11 +4743,11 @@ msgstr ""
 msgid "new email address"
 msgstr "nova elektronska adresa"
 
-#: /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 "System port selected"
 msgstr "Izabran je sistemski port"
 
-#: /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 ""
 "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 "
@@ -4749,139 +4757,139 @@ 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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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 "Greška"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 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:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Alati za komandnu liniju su instalirani"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 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:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "Ne postoji ispravna putanja do dodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Izaberite dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "Dodatak se ne može isključiti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 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:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Dodatak nema opcija koje se mogu menjati"
 
-#: /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: %s does not need customization"
 msgstr "Dodatak: %s ne zahteva podešavanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Podesi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Ne mogu da uklonim ugrađeni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 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:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 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:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr "Dnevnik grešaka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Dnevnik pristupa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 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:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Neispravna veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 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:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "Neispravna lokacija baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "Neispravna lokacija baze podataka "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Mora biti direktorijum."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 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:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
 msgstr "Potrebno je ponovno pokretanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4889,19 +4897,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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 msgid "Checking database integrity"
 msgstr "Proveravam integritet baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "Neuspešna provera integriteta baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "Pronađene su neke nedoslednosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -5036,13 +5044,13 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Slanje na &uređaj"
 
-#: /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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5050,27 +5058,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:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 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:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 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:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 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:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 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:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 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:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5078,136 +5086,140 @@ 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:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " sekundi"
 
-#: /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:537
 msgid "Choose &language (requires restart):"
 msgstr "Izaberi &jezik (zahteva ponovno pokretanje programa):"
 
-#: /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:538
 msgid "Normal"
 msgstr "Normalan"
 
-#: /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:539
 msgid "High"
 msgstr "Visok"
 
-#: /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:540
 msgid "Low"
 msgstr "Nizak"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr "&Prioritet posla:"
 
-#: /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:542
 msgid "Preferred &output format:"
 msgstr "Poželjni izlazni f&ormat:"
 
-#: /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:543
 msgid "Preferred &input format order:"
 msgstr "Poželjan redosled ulazn&ih formata:"
 
-#: /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:546
 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:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 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:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 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:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+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:550
 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:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "Pretraga tokom kucanja"
 
-#: /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 "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:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 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:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 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:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Traka sa alatkama"
 
-#: /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 "Large"
 msgstr "Velika"
 
-#: /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 "Medium"
 msgstr "Srednja"
 
-#: /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 "Small"
 msgstr "Mala"
 
-#: /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 "&Button size in toolbar"
 msgstr "Veličina &dugmadi u traci sa alatkama"
 
-#: /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 "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:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 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:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Remove a user-defined column"
 msgstr "Ukloni korisničku kolonu"
 
-#: /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:565
 msgid "Add a user-defined column"
 msgstr "Dodaj korisničku kolonu"
 
-#: /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 "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:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Koristi &ugrađeni čitač za:"
 
-#: /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 "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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "&Dodaj elektronsku adresu"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Učini &podrazumevanom vrednošću"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "&Ukloni elektronsku adresu"
 
-#: /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:575
 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-"
@@ -5217,35 +5229,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:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 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:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr "&Proveri integritet baze podataka"
 
-#: /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:578
 msgid "&Install command line tools"
 msgstr "&Instaliraj alatke za komandnu liniju"
 
-#: /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:579
 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:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 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:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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 "
@@ -5255,25 +5267,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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "&Port za server:"
 
-#: /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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5281,7 +5293,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:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5289,41 +5301,41 @@ 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:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "Maks. veličina &naslovne strane:"
 
-#: /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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "&Pokreni server"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "&Zaustavi server"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "&Proveri server"
 
-#: /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:594
 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:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "Prikaži &serverski dnevnik"
 
-#: /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:596
 #: /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 "
@@ -5340,7 +5352,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:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5348,27 +5360,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:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "Uključi/&Isključi dodatak"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "&Podesi dodatak"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "&Ukloni dodatak"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Dodaj novi dodatak"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "&Fajl sa dodatkom:"
 
-#: /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:605
 msgid "&Add"
 msgstr "&Dodaj"
 
@@ -5834,7 +5846,7 @@ 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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr "Knjige"
 
@@ -6030,6 +6042,40 @@ msgstr "Potrebna je lozinka"
 msgid "Aborting..."
 msgstr "Prekidam..."
 
+#: /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 ""
+"Izabana sačuvana pretraga će biti <b>izbrisana zauvek</b>. Da li ste sigurni?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr "Uređivač sačuvanih pretraga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr "Sačuvana pretraga: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr "Izaberite sačuvanu pretragu za obadu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr "Izbriši izabranu sačuvanu pretragu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr "Unesite novo ime za sačuvanu pretragu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr "Dodaj novu sačuvanu pretragu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr "Izmeni sadržaj sačuvane pretrage"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
 msgstr "Potrebno je korisničko ime i lozinka"
@@ -6274,21 +6320,21 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Izaberi formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Autori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr "Izdavači"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
 msgid " (not on any book)"
 msgstr " (ni na jednoj knjizi)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:161
+#: /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 ""
@@ -6296,9 +6342,8 @@ msgstr ""
 "sigurni?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
-msgstr "Uređivač etiketa"
+msgid "User Categories Editor"
+msgstr "Uređivač korisničkih kategorija"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
@@ -6345,6 +6390,7 @@ msgid "Select the content kind of the new category"
 msgstr "Izaberite vrstu sadržaja za novu kategoriju"
 
 #: /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 "Da li ste sigurni?"
 
@@ -6356,6 +6402,10 @@ msgstr ""
 "Ove etikete su u upotrebi za više od jedne knjige. Da li ste sigurni da "
 "želite da ih izbrišete?"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr "Uređivač etiketa"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "Raspoloži&ve etikete"
@@ -6398,6 +6448,68 @@ msgstr ""
 "Dodaj etiketu u listu raspoloživih etiketa i stavi je na trenutno izabranu "
 "knjigu"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+msgid "An item cannot be set to nothing. Delete it instead."
+msgstr "Stavka ne može da bude prazna. Izbrišite je."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:66
+msgid "Item already used"
+msgstr "Stavka je već u upotrebi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:67
+msgid "The item %s is already used."
+msgstr "Stavka %s je već u upotrebi."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:79
+msgid "No item selected"
+msgstr "Nije izabrana nijedna stavka"
+
+#: /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 "Morate izabrati jednu stavku iz liste raspoloživih stavki."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:89
+msgid "No items selected"
+msgstr "Nije izabrana nijedna stavka"
+
+#: /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 "Morate izabrati bar jednu stavku iz liste"
+
+#: /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 "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
+msgid "Category Editor"
+msgstr "Uređivač kategorija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+msgid "Items in use"
+msgstr "Stavke u upotrebi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid ""
+"Delete item from database. This will unapply the item from all books and "
+"then remove it from the database."
+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
+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
+msgid "Ctrl+S"
+msgstr "Ctrl+S"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "Proveri podešavanja za elektronsku poštu"
@@ -6800,7 +6912,7 @@ msgstr "Knjiga <font face=\"serif\">%s</font> autora %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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
 msgstr "Ime za pretragu je \"{0}\""
 
@@ -6830,51 +6942,51 @@ msgstr "Izabrano za brisanje"
 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:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
 msgstr "Sakrij kolonu %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
 msgstr "Sortiraj po koloni %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
 msgid "Ascending"
 msgstr "Rastući redosled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
 msgstr "Opadajući redosled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
 msgid "Change text alignment for %s"
 msgstr "Promeni poravnanje za %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Left"
 msgstr "Levo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Right"
 msgstr "Desno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
 msgstr "Centrirano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
 msgstr "Prikaži kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
 msgstr "Vrati podrazumevani izgled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Nije dozvoljeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6957,66 +7069,70 @@ msgstr "Otvori e-knjigu"
 msgid "Configure"
 msgstr "Podesi"
 
-#: /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 "Koristi biblioteku na navedenoj putanji."
 
-#: /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 "Pokreni program sakriven u sistemsku ikonu."
 
-#: /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 "Piši izveštaje o greškama na konzolu"
 
-#: /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 "Ne proveravaj postojanje novije verzije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
+#: /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:74
+#: /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:75
+#: /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:145
+#: /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:146
+#: /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:150
+#: /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 biblioteka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 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:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Neispravna lokacija za bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 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:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr "Neispravna baza podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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 "
@@ -7026,50 +7142,54 @@ 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:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 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:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 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:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr "Pokrećem %s: Učitavam knjige..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 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:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "Ne mogu da pokrenem "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s je već pokrenut."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 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:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr "gornjem desnom uglu ekrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr "donjem desnom uglu ekrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "pokušajte da ponovo pokrenete računar."
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "pokušajte da izbrišete fajl"
 
@@ -7190,7 +7310,7 @@ msgid "Send to device"
 msgstr "Pošalji na uređaj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Snimi na disk"
 
@@ -7215,7 +7335,7 @@ msgid "C"
 msgstr "C"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Prikaži"
 
@@ -7392,11 +7512,44 @@ msgstr "Bočna traka"
 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:235
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:148
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr "Sakrij kategoriju %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr "Prikaži kategoriju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+msgstr "Prikaži sve kategorije"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:167
+msgid "Manage "
+msgstr "Uredi "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:171
+msgid "Manage Saved Searches"
+msgstr "Uredi sačuvane pretrage"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr "Uredi korisničke kategorije"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Pretrage"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+msgstr "Ime %s je već u upotrebi."
+
 #: /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)"
@@ -7440,84 +7593,84 @@ 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:68
+#: /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:155
+#: /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:161
+#: /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:184
+#: /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:201
+#: /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:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "Pošaljite &donaciju da podržite razvoj calibre programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "Isključi pov&ezani uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "&Ponovo pokreni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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:274
+#: /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:276
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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)"
@@ -7526,7 +7679,7 @@ msgstr ""
 "po direktorijumu, podrazumeva se da su različiti fajlovi ista knjiga u "
 "različitiim formatima)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:298
+#: /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)"
@@ -7534,105 +7687,105 @@ 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:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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 "Snimi na disk samo %s format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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 "Sačuvaj samo format %s na disk u jedan direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
+#: /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:368
+#: /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:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /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:414
+#: /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:417
+#: /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:433
+#: /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:473
+#: /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:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Kratko uputstvo za Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
 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:769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "Pretraži po naslovnim stranama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
 msgid "({0} of {1})"
 msgstr "({0} od {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "(sve knjige)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
 msgid "({0} of all)"
 msgstr "({0} od svih)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Uređaj: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " detektovan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Priključen je "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "Baza podatak uređaja je neispravna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7661,149 +7814,149 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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 "Koristi samo biblioteku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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 "Koristite samo beleške iz glavne biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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 "Nije izabrana nijedna knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 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:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr "Dodaj korisničke beleške u bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1126
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 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:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 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:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 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:1160
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 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:1165
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 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:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "Koliko praznih knjiga?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 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:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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 "Prenosim knjige na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1346
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "EPUB knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "LRF knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "HTML knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "LIT knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "MOBI knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr "Topaz knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "Knijge u tekst formatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "PDF knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Stripovi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Arhive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "Podržane knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "Dodao sam neke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 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:1404
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "Nisam uspeo da pročitam metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 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:1425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "Ne mogu da obrišem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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 "Nije izabrana nijedna knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "Izaberite formate za brisanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 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:1494
+#: /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?"
@@ -7811,7 +7964,7 @@ 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:1511
+#: /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?"
@@ -7819,57 +7972,57 @@ 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:1526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "Brišem knjige sa uređaja."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1557
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "Ne mogu da preuzmem metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "društveni metapodaci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "naslovne strane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metapodaci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "Preuzimam %s za %d knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1599
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "Nisam uspeo da preuzmem neke metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1600
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr "Nisam uspeo da preuzmem metapodatke za:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1603
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "Nisam uspeo da preuzmem metapodatke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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 "Ne mogu da promenim metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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 "Ne mogu da spojim knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 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:1681
+#: /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 "
@@ -7881,7 +8034,7 @@ msgstr ""
 "izbrisane niti promenjene.<br><br>Molim vas da potvrdite da želite da "
 "nastavite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1692
+#: /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 "
@@ -7897,7 +8050,7 @@ msgstr ""
 "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:1704
+#: /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?"
@@ -7905,40 +8058,40 @@ 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:1803
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Ne mogu da snimim na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "Promeni ciljni direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "Greška pri snimanju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 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:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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 "Nisam uspeo da snimim neke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1849
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 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:1870
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 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:1887
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "Kreiram katalog %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -7946,44 +8099,44 @@ msgstr ""
 "Nema knjiga za katalog\n"
 "Proverite ignorisane etikete"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "Katalog je kreiran."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "Direktorijum za izvoz kataloga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "Izaberi odredište za %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1921
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "Preuzimam vesti sa "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " preuzeto."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "Ne mogu da konvertujem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr "Počinjem konverziju %d knjiga."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "Nemoguće pregledati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2145
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "Izabrano je više knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
+#: /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 "
@@ -7995,44 +8148,44 @@ msgstr ""
 "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:2155
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
 msgid "Cannot open folder"
 msgstr "Ne mogu da otvorim direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s nema raspoloživih formata."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Ne mogu da podesim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 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:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Ne postoje detaljne informacije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
 msgstr "Nije uspelo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "Greška u komunikaciji sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2343
+#: /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."
@@ -8040,12 +8193,12 @@ 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:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Greška u konverziji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -8053,15 +8206,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:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Recept je isključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Neuspelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -8070,12 +8223,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:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8086,11 +8239,11 @@ msgstr ""
 "uređaju.<br>\n"
 "                      Da li ste sigurni da želite da prekinete rad?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "UPOZORENJE: Aktivni poslovi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8098,7 +8251,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:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8106,11 +8259,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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Nova verzija je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -9540,7 +9693,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:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Prikaži detaljne informacije. Korisno za traženje grešaka"
 
@@ -9664,28 +9817,28 @@ msgstr "Kartica A"
 msgid "Card B"
 msgstr "Kartica B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 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:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Kopiram <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Sažimam bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Proveravam ispravnost SQLa..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Tražim nepostojeće fajlove."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "Proverio identifikator"
 
@@ -9903,10 +10056,13 @@ 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:124
 msgid "%d books"
 msgstr "%d knjiga"
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr "%d stavki."
+
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
 msgstr "OCENA: %s<br />"
@@ -10174,89 +10330,89 @@ msgstr "Ne preuzimaj najnoviju verziju ugrađenih recepata sa calibre servera"
 msgid "Unknown News Source"
 msgstr "Nepoznat izvor vesti"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 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:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Preuzimanje gotovo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 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:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 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:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " sa "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tNeuspele veze:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Preuzimam izvore..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "Dobio sam izvore s osnovne strane..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Pokušavam da preuzmem naslovnu stranu..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Generišem impresum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Počinjem preuzimanje [%d niti]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Izvori su preuzeti u %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Nisam uspeo da preuzmem naslovnu stranu: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Preuzimam naslovnu stranu sa %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "Preuzeo sam sliku za impresum"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Članak bez imena"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Preuzeo sam članak: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Nije uspelo preuzimanje članka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Preuzimam izvor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10264,7 +10420,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:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -10287,7 +10443,7 @@ msgstr "Planirano"
 msgid "Custom"
 msgstr "Po meri"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10297,24 +10453,24 @@ msgstr ""
 "\n"
 "Gde je URL na primer http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 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:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 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:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 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:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10322,7 +10478,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:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10330,7 +10486,7 @@ msgstr ""
 "Najmanji razmak, u sekundama, između uzastopnih preuzimanja. Podrazumeva se "
 "%default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10338,7 +10494,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:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -10349,7 +10505,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:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -10363,7 +10519,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:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Ne preuzimaj CSS stilove."
 
diff --git a/src/calibre/translations/sv.po b/src/calibre/translations/sv.po
index 4023c60c3b..7c7beef8d8 100644
--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-31 16:18+0000\n"
-"PO-Revision-Date: 2010-05-31 21:34+0000\n"
-"Last-Translator: Merarom <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:53+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-01 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -70,9 +70,9 @@ msgstr "Gör ingenting"
 #: /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,8 +100,8 @@ 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:272
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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/add.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
@@ -121,18 +121,18 @@ msgstr "Gör ingenting"
 #: /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:1760
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:863
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1294
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1296
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1418
+#: /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/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
@@ -158,11 +158,11 @@ msgstr "Filtyp"
 msgid "Metadata reader"
 msgstr "Läsare för metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Skrivare för metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Kataloggenerator"
 
@@ -281,7 +281,7 @@ msgstr ""
 "du inte vet något om ingångsdokumentet."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262
+#: /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 "Denna profil är avsedd för Sonys PRS-linje: 500/505/600/700 m.fl."
@@ -291,62 +291,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:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 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:326
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 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:337
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 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:350
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 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:362
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 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:370
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 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:383
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 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:394
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 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:429
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 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:442
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 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:456
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 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:470
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Denna profil är avsedd för B&N Nook."
 
@@ -364,24 +364,24 @@ msgstr ""
 "om du vill skapa en handling som skall läsas på en dator eller på en rad "
 "olika enheter."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:251
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
 msgstr "Avsedd för iPad och liknande enheter med en upplösningen 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:275
+#: /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."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:287
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 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:305
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Denna profil är avsedd för 5-tums JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:314
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -389,7 +389,7 @@ msgstr ""
 "Denna profil är avsedd för Sonys PRS-linje: Den 500/505/700 m.fl, i liggande "
 "format. Används främst för serietidningar."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:412
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Denna profil är avsedd för Amazon Kindle DX."
 
@@ -477,33 +477,33 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommunicera med S60-telefoner"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
 msgid "Communicate with iBooks through iTunes."
 msgstr "Kommunicera med iBook via iTunes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:56
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
 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:114
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:135
+#: /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
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:195
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:793
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:930
+#: /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
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:935
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
 msgid "finished"
 msgstr "slutförda"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:349
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -513,17 +513,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:588
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:614
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr "inställningar för drivrutiner"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:590
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:616
 #: /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"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:704
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:729
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -766,7 +766,7 @@ msgstr "Det finns tillräckligt mycket ledigt utrymme på minneskortet"
 #: /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:1178
+#: /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"
@@ -1995,7 +1995,7 @@ msgid "Comments"
 msgstr "Kommentarer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2005,7 +2005,7 @@ msgid "Tags"
 msgstr "Etiketter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:386
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /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
@@ -2272,7 +2272,7 @@ msgstr ""
 "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/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Omslag"
 
@@ -2314,70 +2314,70 @@ msgstr "Alla artiklar"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Det här är en Amazon Topaz-bok. Den kan inte hanteras."
 
-#: /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 "Titelsida"
 
-#: /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 "Innehållsförteckning"
 
-#: /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 "Översikt"
 
-#: /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 "Ordförklaringar"
 
-#: /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 "Erkännande"
 
-#: /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 "Litteraturförteckning"
 
-#: /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 "Kolofon"
 
-#: /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 "Upphovsrätt"
 
-#: /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 "Tillägnan"
 
-#: /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 "Epigraf"
 
-#: /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 "Förord"
 
-#: /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 "Illustrationslista"
 
-#: /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 "Tabellista"
 
-#: /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 "Anteckningar"
 
-#: /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 "Förord"
 
-#: /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 "Huvudtext"
 
@@ -2937,20 +2937,24 @@ msgstr "Skriv över författare och titel med nya metadata"
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Övre maximumgräns på samtidiga jobb till antalet CPUer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /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:138
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopierad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Kopiera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Kopiera till klippbordet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "Välj filer"
 
@@ -2958,41 +2962,41 @@ msgstr "Välj filer"
 msgid "Searching in"
 msgstr "Söker i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Lägger till..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:242
 msgid "Searching in all sub-directories..."
 msgstr "Söker i all underkataloger..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "Sökvägsfel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
 msgid "The specified directory could not be processed."
 msgstr "Den angivna katalogen kunde inte behandlas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:260
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
 msgid "No books"
 msgstr "Inga böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
+#: /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:325
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Tillagd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Lägga till misslyckades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
+#: /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."
@@ -3001,11 +3005,11 @@ msgstr ""
 "calibre och lägg till böcker i mindre steg, tills du hittar boken som ger "
 "problemet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "Dubbletter hittades!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
+#: /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?"
@@ -3013,15 +3017,15 @@ msgstr ""
 "Böcker med samma titel som följande finns redan i databasen. Lägga till dem "
 "i alla fall?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "Lägger till dubbletter ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Sparad"
 
@@ -3119,15 +3123,15 @@ msgstr ""
 #: /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:527
-#: /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:542
-#: /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:560
-#: /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: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/dialogs/config/config_ui.py:565
-#: /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: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/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
@@ -3136,6 +3140,8 @@ msgstr ""
 #: /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
@@ -3144,6 +3150,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/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
@@ -3253,8 +3261,8 @@ msgstr "E-book alternativ"
 
 #: /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:1141
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1247
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1265
 msgid "Catalog"
 msgstr "Katalog"
 
@@ -3971,20 +3979,20 @@ msgstr "Behåll omslags &aspect förhållande"
 msgid "RB Output"
 msgstr "RB utdata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
+#: /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"
 
-#: /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 "Kan inte bygga regex med GUI byggare utan en bok."
 
-#: /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 "Inga format finns"
 
-#: /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 "Öppna bok"
 
@@ -4740,11 +4748,11 @@ msgstr ""
 msgid "new email address"
 msgstr "ny e-postadress"
 
-#: /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 "System port selected"
 msgstr "System port vald"
 
-#: /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 ""
 "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 "
@@ -4754,139 +4762,139 @@ 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:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:927
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1604
+#: /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:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr "Misslyckades med att installera kommandoradsverktygen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "Kommandoradsverktygen installerade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr "Kommandoradsverktygen installerade i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 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."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "Ingen giltig sökväg för instickmodulen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s är ingen giltig sökväg för instickmodulen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "Välj instickmodul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /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:581
+#: /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:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "Instickmodulen går inte att anpassa"
 
-#: /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: %s does not need customization"
 msgstr "Instickmodulen: %s behöver inte anpassas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "Anpassa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "Kan inte ta bort inbyggd instickmodul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 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."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
 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:674
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
 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:675
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 #: /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:676
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:678
 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:743
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:745
 msgid "Error log:"
 msgstr "Fellogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:750
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "Åtkomstlogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "Misslyckades med att starta innehållsservern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
 #: /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:809
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "Ogiltig storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 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"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "Ogiltig plats för databas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "Ogiltig plats för databas "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>Måste vara en katalog."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 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:873
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
 msgid "Must restart"
 msgstr "Måste starta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -4894,19 +4902,19 @@ 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:908
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:911
 msgid "Checking database integrity"
 msgstr "Kontrollar databas integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "Misslyckades att kontrolla databas integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:933
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "Några inkonsekvenser funna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:934
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -5040,13 +5048,13 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Skickar till enheten"
 
-#: /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:527
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:441
 #: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5054,27 +5062,27 @@ 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)"
 
-#: /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:529
 msgid "Browse for the new database location"
 msgstr "Bläddra fram till den nya databasen platsen"
 
-#: /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:531
 msgid "Show notification when &new version is available"
 msgstr "Visa meddelande när &ny version finns tillgänglig"
 
-#: /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:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Ladda ner &social metadata (etiketter / omdömen / etc.) Som standard"
 
-#: /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:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Skriv över författare och titel som standard när hämtar metadata"
 
-#: /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:534
 msgid "Default network &timeout:"
 msgstr "Grundinställning av &tidbegränsning för nätverk:"
 
-#: /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:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5082,132 +5090,136 @@ msgstr ""
 "Ange standard tidbegränsning för nätverkshämtning (dvs. som helst går vi ut "
 "på Internet för att få information)"
 
-#: /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:536
 msgid " seconds"
 msgstr " sekunder"
 
-#: /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:537
 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:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "Normal"
 
-#: /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:539
 msgid "High"
 msgstr "Hög"
 
-#: /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:540
 msgid "Low"
 msgstr "Låg"
 
-#: /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:541
 msgid "Job &priority:"
 msgstr "Jobb&prioritet:"
 
-#: /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:542
 msgid "Preferred &output format:"
 msgstr "Önskat &utformat:"
 
-#: /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:543
 msgid "Preferred &input format order:"
 msgstr "Önskat &informatsordning:"
 
-#: /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:546
 msgid "Use &Roman numerals for series number"
 msgstr "Använd &romerska siffror för serienummer"
 
-#: /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:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Aktivera systemfälts&ikonen (kräver omstart)"
 
-#: /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:548
 msgid "Show &notifications in system tray"
 msgstr "&Visa meddelanden i systemfältet"
 
-#: /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:549
+msgid "Show &splash screen at startup"
+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:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "Sök &medan du skriver"
 
-#: /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 "Automatically send downloaded &news to ebook reader"
 msgstr "Automatiskt skicka hämtade &nyheter till e-boksläsare"
 
-#: /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 "&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"
 
-#: /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 "&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:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "Verktygsrad"
 
-#: /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 "Large"
 msgstr "Stor"
 
-#: /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 "Medium"
 msgstr "Medel"
 
-#: /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 "Small"
 msgstr "Liten"
 
-#: /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 "&Button size in toolbar"
 msgstr "&Bildknappstorlek i verktygsfältet"
 
-#: /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 "Show &text in toolbar buttons"
 msgstr "Visa &text på bildknappar"
 
-#: /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 "Select visible &columns in library view"
 msgstr "Välj synliga &kolumnerna i biblioteketsvy"
 
-#: /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 "Remove a user-defined column"
 msgstr "Ta bort ett användardefinierat kolumnen"
 
-#: /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:565
 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:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 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:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 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:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 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:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "Lägg till e-post"
 
-#: /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:573
 msgid "Make &default"
 msgstr "Ange som grundinställning"
 
-#: /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:574
 msgid "&Remove email"
 msgstr "Ta bort e-post"
 
-#: /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:575
 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-"
@@ -5217,31 +5229,31 @@ msgstr ""
 "skickas automatiskt för nedladdade nyheter för alla e-postadresser som har "
 "markerats automatskickas."
 
-#: /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:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Maximalt antal väntar arbetstagare processer (kräver omstart):"
 
-#: /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:577
 msgid "&Check database integrity"
 msgstr "&Kontrollera databasintegritet"
 
-#: /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:578
 msgid "&Install command line tools"
 msgstr "&Installera kommandoradsverktyg"
 
-#: /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:579
 msgid "Open calibre &configuration directory"
 msgstr "Öppna &calibre inställningsmapp"
 
-#: /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:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "Begränsa max. samtidiga jobb till lediga &CPU-kärnor"
 
-#: /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:581
 msgid "Debug &device detection"
 msgstr "Felsök enhets&detektion"
 
-#: /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:582
 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 "
@@ -5251,25 +5263,25 @@ msgstr ""
 "boksamling med en webbläsare från hela världen. 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:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "Server&port:"
 
-#: /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:584
 #: /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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 #: /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:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5277,7 +5289,7 @@ msgstr ""
 "Om du lämnar lösenordet tomt, kan vem som helst komma åt din boksamling med "
 "webbgränssnittet."
 
-#: /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:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5285,41 +5297,41 @@ msgstr ""
 "Den maximala storleken (bredd x höjd) för att visas täcker. Större täcker "
 "ändrar storlek. "
 
-#: /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:588
 msgid "Max. &cover size:"
 msgstr "Max. omslagsstorlek:"
 
-#: /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:589
 #: /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:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr "Max. &OPDS poster per fråga:"
 
-#: /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:591
 msgid "&Start Server"
 msgstr "&Starta Server"
 
-#: /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:592
 msgid "St&op Server"
 msgstr "St&oppa Server"
 
-#: /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:593
 msgid "&Test Server"
 msgstr "&Testserver"
 
-#: /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:594
 msgid "Run server &automatically on startup"
 msgstr "Kör server och &automatiskt vid start"
 
-#: /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:595
 msgid "View &server logs"
 msgstr "Visa &serverloggar"
 
-#: /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:596
 #: /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 "
@@ -5336,7 +5348,7 @@ msgstr ""
 "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å."
 
-#: /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:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5344,27 +5356,27 @@ msgstr ""
 "Här kan du anpassa beteendet hos Calibre genom att kontrollera vilka "
 "instickmoduler den använder."
 
-#: /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:599
 msgid "Enable/&Disable plugin"
 msgstr "Aktivera Avaktivera instickmodul"
 
-#: /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:600
 msgid "&Customize plugin"
 msgstr "Anpassa instickmodul"
 
-#: /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:601
 msgid "&Remove plugin"
 msgstr "Ta bort instickfil"
 
-#: /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:602
 msgid "Add new plugin"
 msgstr "Lägg till ny instickmodul"
 
-#: /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:603
 msgid "Plugin &file:"
 msgstr "Insticks&fil:"
 
-#: /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:605
 msgid "&Add"
 msgstr "Lägg till"
 
@@ -5827,7 +5839,7 @@ 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:1345
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1382
 msgid "Books"
 msgstr "Böcker"
 
@@ -6020,6 +6032,39 @@ msgstr "Lösenord krävs"
 msgid "Aborting..."
 msgstr "Avbryter..."
 
+#: /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 "Behöver användarnamn och lösenord"
@@ -6265,21 +6310,21 @@ msgstr ""
 msgid "Choose formats"
 msgstr "Välj format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
 msgid "Authors"
 msgstr "Författare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
 msgid "Publishers"
 msgstr "Utgivare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
 msgid " (not on any book)"
 msgstr " (Inte på någon bok)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:161
+#: /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 ""
@@ -6287,9 +6332,8 @@ msgstr ""
 "säker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
-msgid "Tag Editor"
-msgstr "Taggredigerare"
+msgid "User Categories Editor"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
@@ -6336,6 +6380,7 @@ msgid "Select the content kind of the new category"
 msgstr "Välj vilken slag innehåll i den nya kategorin"
 
 #: /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 "Är du säker?"
 
@@ -6347,6 +6392,10 @@ msgstr ""
 "Följande taggar 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"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "Tillgängliga etikett"
@@ -6387,6 +6436,66 @@ msgstr ""
 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"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+msgid "Ctrl+S"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
 msgstr "Testa e-postsinställningar"
@@ -6789,7 +6898,7 @@ 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:241
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
 msgid "The lookup/search name is \"{0}\""
 msgstr "Söknamn är \"(0)\""
 
@@ -6819,51 +6928,51 @@ msgstr "Markerat för borttagning"
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dubbelklicka <b> redigera </b> me <br> <br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
 msgid "Hide column %s"
 msgstr "Dölj kolumn %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
 msgid "Sort on %s"
 msgstr "Sortera på %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
 msgid "Ascending"
 msgstr "Stigande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Descending"
 msgstr "Fallande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
 msgid "Change text alignment for %s"
 msgstr "Ändra textjustering för %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Left"
 msgstr "Vänster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
 msgid "Right"
 msgstr "till höger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
 msgid "Center"
 msgstr "Centrera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
 msgid "Show column"
 msgstr "Visa kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Restore default layout"
 msgstr "Återställ standardutformning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "Inte tillåten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -6944,65 +7053,69 @@ msgstr "Öppna e-bok"
 msgid "Configure"
 msgstr "Anpassa"
 
-#: /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 "Använd biblioteket som ligger på den angivna sökvägen."
 
-#: /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 "Start minimerad till aktivitetsfältet."
 
-#: /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 "Logga felsökningsinformation till konsol"
 
-#: /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 "Sök inte efter uppdateringar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
+#: /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:74
+#: /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:75
+#: /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:145
+#: /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:146
+#: /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:150
+#: /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 bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr "Välj en plats för din nya calibre e-bokbibliotek"
 
-#: /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:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "Dålig databasplats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr "Felaktig databasplats %r. calibre kommer nu avslutas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr "Skadad databas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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 "
@@ -7012,47 +7125,51 @@ msgstr ""
 "reparera den automatiskt? Om du säger nej, kommer ett nytt calibre-bibliotek "
 "att skapas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 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:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 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"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr "Om du är säker på att det inte kör"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "Kan inte starta "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s kör redan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr "kan köras i systemfältet i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 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:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 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:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "försök starta om datorn."
 
-#: /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:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "försök ta bort filen"
 
@@ -7174,7 +7291,7 @@ 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:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:355
 msgid "Save to disk"
 msgstr "Spara på disk"
 
@@ -7199,7 +7316,7 @@ msgid "C"
 msgstr "C"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "Visa"
 
@@ -7377,11 +7494,44 @@ msgstr ""
 msgid "Cover browser could not be loaded: "
 msgstr "Omslagsläsaren kunde inte laddas: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:235
+#: /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
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "Sökningar"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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)"
@@ -7424,84 +7574,84 @@ msgid ""
 msgstr ""
 "Följande böcker har redan omvandlats till %s-format. Vill du omvandla dem?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr "Spara enda format till disk ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:155
+#: /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:161
+#: /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:184
+#: /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:201
+#: /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:203
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "&Donera för att stödja Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "Mata ansluten &enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "Omsta&rt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:274
+#: /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:276
+#: /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:278
+#: /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:279
+#: /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:280
+#: /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:281
+#: /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:285
+#: /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:287
+#: /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:294
+#: /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:295
+#: /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)"
@@ -7509,7 +7659,7 @@ 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:298
+#: /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)"
@@ -7517,105 +7667,105 @@ 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:301
+#: /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:349
+#: /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:350
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
+#: /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:353
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+#: /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:363
+#: /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:368
+#: /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:370
+#: /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:372
+#: /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:374
+#: /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:413
+#: /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:414
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr "Massomvandling"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:417
+#: /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:433
+#: /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:473
+#: /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:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre snabbstartsguide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:658
+#: /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:769
+#: /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:837
+#: /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:842
+#: /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:844
+#: /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:954
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "Enhet: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " funnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "Ansluten "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
+#: /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:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -7643,149 +7793,149 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1064
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
+#: /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:1065
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
+#: /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:1072
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1558
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1653
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1674
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1804
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1869
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1987
+#: /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:1073
+#: /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:1098
+#: /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:1126
+#: /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:1132
+#: /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:1151
+#: /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:1160
+#: /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:1165
+#: /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:1285
+#: /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:1286
+#: /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:1334
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
+#: /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:1346
+#: /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:1347
+#: /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:1348
+#: /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:1349
+#: /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:1350
+#: /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:1351
+#: /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:1352
+#: /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:1353
+#: /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:1354
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "Serier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "Arkiv"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
+#: /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:1394
+#: /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:1395
+#: /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:1404
+#: /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:1405
+#: /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:1425
+#: /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:1428
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /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:1438
+#: /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:1456
+#: /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:1494
+#: /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?"
@@ -7793,7 +7943,7 @@ 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:1511
+#: /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?"
@@ -7801,57 +7951,57 @@ 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:1526
+#: /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:1557
+#: /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:1573
+#: /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:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
+#: /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:1599
+#: /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:1600
+#: /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:1603
+#: /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:1614
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
+#: /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:1673
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
+#: /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:1677
+#: /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:1681
+#: /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 "
@@ -7863,7 +8013,7 @@ msgstr ""
 "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:1692
+#: /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 "
@@ -7879,7 +8029,7 @@ msgstr ""
 "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:1704
+#: /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?"
@@ -7887,40 +8037,40 @@ 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:1803
+#: /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:1806
+#: /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:1839
+#: /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:1840
+#: /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:1847
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
+#: /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:1849
+#: /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:1870
+#: /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:1887
+#: /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:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -7928,44 +8078,44 @@ msgstr ""
 "Inga böcker till katalog\n"
 "Kontrollera uteslutna taggar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1903
+#: /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:1906
+#: /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:1907
+#: /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:1921
+#: /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:1935
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " hämtade."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
+#: /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:2015
+#: /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:2131
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
+#: /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:2145
+#: /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:2146
+#: /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 "
@@ -7977,45 +8127,45 @@ msgstr ""
 "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:2155
+#: /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:2190
+#: /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:2231
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "Kan inte konfigurera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 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:2237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
 msgid "Cannot configure before calibre is restarted."
 msgstr "Kan inte konfigurera innan calibre startas om."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "Ingen detaljinformation tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 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:2336
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
+#: /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:2343
+#: /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."
@@ -8023,12 +8173,12 @@ 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:2366
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "Omvandling misslyckades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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."
@@ -8036,15 +8186,15 @@ 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."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "Recept inaktiverat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>Misslyckades</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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."
@@ -8053,11 +8203,11 @@ msgstr ""
 "tycker att det är bra, vänligen överväg att donera till stöd för dess "
 "utveckling."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2467
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 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?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8067,11 +8217,11 @@ msgstr ""
 "                      Avsluta kan orsaka skador på enheten. <br>\n"
 "                      Är du säker på att du vill sluta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2474
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "VARNING: Aktiva jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8079,7 +8229,7 @@ msgstr ""
 "fortsätter att köra i systemfältet. FÖr att stänga det, välj <b> Avsluta "
 "</b> i snabbmenyn systemfältet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2545
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -8087,11 +8237,11 @@ 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:2553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "Nyare version hittad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -9522,7 +9672,7 @@ msgstr ""
 "Grundinställning: Ingen filtrering"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:655
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:497
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Visa detaljerad utdata. Användbart för felsökning"
 
@@ -9644,27 +9794,27 @@ msgstr "Kort A"
 msgid "Card B"
 msgstr "Kort B"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1444
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p> Migrera gamla databasen med e-bokbibliotek i%s <br> <center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "Kopiering <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "Komprimerande databas"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "Kontrollerar SQL integritet ..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "Kontroll av saknade filer."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1643
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "Kontrollerad id"
 
@@ -9883,10 +10033,13 @@ msgid "Write process PID to the specified file"
 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:124
 msgid "%d books"
 msgstr "%d böcker"
 
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
 msgid "RATING: %s<br />"
 msgstr "BETYG: %s<br />"
@@ -10154,87 +10307,87 @@ msgstr "Hämta inte senaste versionen av inbyggda recept från calibre-servern"
 msgid "Unknown News Source"
 msgstr "Okänd nyhetskälla"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\" receptet behöver ett användarnamn och lösenord."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "Hämtningen är färdig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "Misslyckades med att hämta följande artiklar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr "Misslyckades med att hämta  delar av följande artiklar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " från "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\tMisslyckade länkar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 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"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "Hämtar flöden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "Fick flöden från indexsidan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "Försöker hämta omslaget ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "Skapar masthead..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "Påbörjar hämtning [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "Flöden ner laddningade till %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "Kunde inte ladda ner omslag: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "Laddar ner omslag från %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "Masthead bild hämtad"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Namnlös Artikel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1196
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "Artikel nerladdad: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1207
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "Artikelnerladdning misslyckades: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1224
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Hämtar flöde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1371
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10242,7 +10395,7 @@ msgstr ""
 "Misslyckades med att logga in, kontrollera ditt användarnamn och lösenord "
 "för kaliber Periodicals tjänsten."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1387
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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."
@@ -10266,7 +10419,7 @@ msgstr "Schemalagd"
 msgid "Custom"
 msgstr "Anpassad"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -10276,11 +10429,11 @@ msgstr ""
 "\n"
 "Där webbadressen är till exempel http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Baskatalogen i vilken webbadress sparas. Grundinställning %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -10288,7 +10441,7 @@ msgstr ""
 "Tidsgräns i sekunder för att vänta på ett svar från servern. "
 "Grundinställning %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -10296,7 +10449,7 @@ msgstr ""
 "Maximalt antal nivåer av upprepning dvs länkdjup att följa. Grundinställning "
 "%default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -10304,7 +10457,7 @@ msgstr ""
 "Det maximala antal filer att ladda ner. Endast för filer med <a href> "
 "taggar. Grundinställning är %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -10312,7 +10465,7 @@ msgstr ""
 "Minsta intervall i sekunder mellan varandra följande hämtar. "
 "Grundinställning är %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:490
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -10320,7 +10473,7 @@ msgstr ""
 "Teckenkodning för de webbplatser som du försöker ladda ner. Grundinställning "
 "är att försöka gissa kodningen."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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 "
@@ -10330,7 +10483,7 @@ msgstr ""
 "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 ."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -10344,7 +10497,7 @@ msgstr ""
 "ignoreras. Om både --filter-regexp och --match-regexp anges så används  --"
 "filter-regexp först."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "Ladda inte ner CSS stilmallar."
 
diff --git a/src/calibre/translations/tr.po b/src/calibre/translations/tr.po
index be2ebe532d..06bc3325f1 100644
--- a/src/calibre/translations/tr.po
+++ b/src/calibre/translations/tr.po
@@ -7,166 +7,166 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:18+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:56+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-05-30 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "Hiçbir şey yapmaz"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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 "Bilinmiyor"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "Temel"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "Dosya türü"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "Metadata okuyucusu"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Metadata yazıcısı"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Katalog oluşturucu"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 "
@@ -176,7 +176,7 @@ msgstr ""
 "içeren bir ZIP dosyası yarat. Bu eklenti, kütüphaneye bir HTML dosyası "
 "eklediğiniz her seferinde çalışır."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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."
@@ -184,7 +184,7 @@ msgstr ""
 "Girilecek HTML dosyaları için karakter kodlaması. Genel tercihler cp1252, "
 "latin1, iso-8859-1 and utf-8'dir."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -194,57 +194,57 @@ msgstr ""
 "içeren bir PMLZ arşivi oluştur. Bu eklenti, kütüphaneye bir PML dosyası "
 "eklediğiniz her seferinde çalışır."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "Çizgi roman dosyalarından kapağı çıkart."
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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 dosyalarından metadata oku"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "RAR arşivleri içindeki ekitaplardan metadata oku"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Zip arşivlerindeki kitapların metadatasını oku"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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 dosyalarındaki metadatayı belirle"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "%s dosyalarından metadata belirle"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "Dönüştürme Girişi"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -256,11 +256,11 @@ msgstr ""
 "herhangi bir dil kodlaması bulunmayan ya da dil kodlaması hatalı olan "
 "belgeler için yararlıdır."
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "Dönüşüm Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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."
@@ -269,11 +269,11 @@ msgstr ""
 "olacak şekilde çıktı oluşturmaya çalışacaktır. Bazı çıktı eklentileri için "
 "herhangi bir etkisi olmayabilir."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "Giriş profili"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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."
@@ -281,81 +281,81 @@ msgstr ""
 "Bu profil en uygun varsayılanları sağlamaya çalışır ve giriş belgesi "
 "hakkında hiçbir şey bilmiyorsanız faydalıdır."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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 "Bu profil SONY PRS serisini hedefler. 500/505/600/700 vs."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:69
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr "Bu profil SONY PRS 300'ü hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Bu profil SONY PRS 900'ü hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Bu profil Microsoft Reader'ı hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Bu profil Mobipocket kitaplarını hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "Bu profil Hanlin V3 ve klonlarını hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Bu profil Hanlin V5 ve klonlarını hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "Bu profil Hanlin Cybook G3'ü hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "Bu profil Cybook Opus'u hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Bu profil Amazon Kindle'ı hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "Bu profil Irex Illiad'ı hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "Bu profil IRex Digital Reader 1000'i hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Bu profil IREX Dijital Reader 800 içindir."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "Bu profil B&N Nook'u hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "Çıkış profili"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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 "
@@ -364,24 +364,24 @@ msgstr ""
 "Bu profil en uygun varsayılanları sağlamaya çalışır ve belge bilgisayar ya "
 "da benzer cihazlar üzerinde okunacak ise faydalıdır."
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "Bu profil SONY PRS-300'ü hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Bu profil 5 inç JetBook'u hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -389,35 +389,35 @@ 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/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Bu profil Amazon Kindle DX'i hedefler."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "Yüklü eklentiler"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "Dosya türü eklentileri için eşleştirme"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "Yerel eklenti özelleştirme"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "Çalışmayan eklentiler"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "de geçerli bir eklenti bulunamadı. "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "%s eklentisi şu geri dönüş ile başlatılamadı:"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -429,18 +429,18 @@ msgstr ""
 "    Harici eklentiler yükleyerek Calibre'ye özelleştirin.\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 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/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 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/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -448,460 +448,499 @@ msgstr ""
 "Eklentiyi özelleştir. Eklenti ismiyle özelleştirme dizesini virgülle "
 "ayırarak belirleyin."
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "Kurulu eklentileri listele"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçerli"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçersiz"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "Android telefonlar ile iletişim kur."
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr "S60 telefonlar ile haberleş."
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+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 ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "Blackberry smart phone ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr "Cybook Gen 3 / Opus eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "EB600 eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr "Entourage Edge ile haberleş."
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "ESlick eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Hanlin V3 serisi eBook readerlar ile bağlantı kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Hanlin V5 serisi eBook readerlar ile bağlantı kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "BOOX eBook reader ile bağlantı kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Hanvon N520 eBook reader ile bağlantı kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "SpringDesign Alex eBook reader ile haberleş."
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr "Azbooka ile iletişim kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Elonex EB 511 eBook reader ile haberleş."
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "IRex Iliad eBook reader ile bağlantı kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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 "Araç arayüzü"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+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
+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
+msgid "Communicate with the BOOX eBook reader."
+msgstr "BOOX eBook reader ile bağlantı kur"
+
+#: /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"
+
+#: /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 eBook reader ile haberleş."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
+msgid "Communicate with the Azbooka"
+msgstr "Azbooka ile iletişim kur"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr "Elonex EB 511 eBook reader ile haberleş."
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "IRex Digital Reader 1000 eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "IRex Digital Reader 800 ile haberleş."
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "Iriver Story reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "JetBook eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "Kindle eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "Kindle 2 eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "Kindle DX eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr "Kobo Reader ile iletişim kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "Palm Pre ile iletişim kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr "Booq Avant ile iletişim kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Nokia 770 internet tablet ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "Nokia 810 internet tablet ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "The Nook ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "Nook eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "Nuut2 eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "Sony PRS-500 eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:89
-msgid "Getting list of books on device..."
-msgstr "Cihazdaki kitapların listesi alınıyor..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "Sony PRS-300/505/500 eBook reader ile bağlantı kur"
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "Kitaplar cihaza aktarılıyor..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "İsimsiz"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Cihazdaki kitaplar kaldırılıyor..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Metadata bilgileri cihaza gönderiliyor..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "Sony PRS-600/700/900 eBook reader ile bağlantı kur"
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr "Samsung SNE eBook reader ile haberleş."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "Teclast K3 reader ile haberleş."
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr "iPapyrus okuyucu ile iletişim kur."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 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/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "%s bağlantı noktası bulunamadı. Yeniden başlatmayı deneyin."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "%s disk sürücüsü bulunamıyor."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "Bağlama yardımcısı bulunamıyor:  %s."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "Ana hafıza monte edilemiyor (Hata kodu: %d)"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "Seçilen yuva : %s desteklenmiyor."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "Ana hafızada yeterli boş alan yok ."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "Saklama kartında yeterli boş yer yok."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "Haberler"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "Aygıtı Yapılandır"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
 msgid "Place files in sub directories if the device supports them"
 msgstr "Donanım destekliyor ise, dosyaları alt dizinlerde bulundur."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "Metadataları donanımdaki dosyalardan oku."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "Kitapların nasıl kaydedileceğine ilişkin kontrol şeması"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "Ekstra kişiselleştirme"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "e-Kitap okuyucusu ile haberleş."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "Aygıt bilgisini al..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "Donanım metadata listesine kitaplar ekleniyor ..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "Donanım  metadata listesinden  kitaplar çıkarılıyor ..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "Metadata bilgileri cihaza gönderiliyor..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [options] mybook.chm"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "Kaydetme dizini . Varsayılan olarak mevcut dizin."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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 "Kitap ismini kaydet."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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 "Sıralama anahtarını başlık olarak kaydet."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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 "Yazar kaydet."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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 "Sıralama anahtarını yazar olarak kaydet."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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 "Bu kitabın kategorisi : Örneğin :Tarih"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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 "Yayımcıyı ayarla"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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 "Kitap sınıflandırmasını kaydet"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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 "Kitap oluşturanı kaydet"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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 "Kitap üreticisini kaydet"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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 "Kitap ID sini  kaydet"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr "%s  sn de biçimlendirildi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "Başarısız %s sn"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:286
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr "Resim boyoranını koru. Varsayılan olarak ekranı kapla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "Keskinleştirmeyi  kapat."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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."
@@ -909,55 +948,55 @@ msgstr ""
 "Çizgi romanlarda  düzeltmeyi kapat . Bağzı çizgi romanlarsa yapılan düzeltme "
 "işlemi içeriğinde  kaldırılmasına sebep olur."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:293
 msgid "Don't split landscape images into two portrait images"
 msgstr "Yatık resimleri iki ayrı resme bölme"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "Resim üzerinde hiçbir işlem yapma"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315
 msgid "Do not convert the image to grayscale (black and white)"
 msgstr "Resmi gri renklere dönüştürme ( Siyah ve beyaz)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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 "Sayfa"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -983,65 +1022,65 @@ msgid ""
 "For full documentation of the conversion system see\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "İÇERİ ALMA SEÇENEKLERİ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "ÇIKIŞ ALMA SEÇENEKLERİ"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "Çıkış almak için metadata seçeneklerini kaydet."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "Dönüştürme  hatalarını bulmak için yardım seçenekleri"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "Dahili reçete listesi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1049,7 +1088,7 @@ msgid ""
 "are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1057,7 +1096,7 @@ msgid ""
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1065,7 +1104,7 @@ msgid ""
 "chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1074,17 +1113,17 @@ msgid ""
 "use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1092,58 +1131,58 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1153,7 +1192,7 @@ msgid ""
 "User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1161,39 +1200,39 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1202,27 +1241,27 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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)."
@@ -1230,47 +1269,47 @@ msgstr ""
 "Paragraflar arasında boş satır bırak . Eğer kaynak dosya paragraf ( <p> veya "
 "<div> tag ları)  kullanmıyor ise çalışmayacaktır ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1280,7 +1319,7 @@ msgid ""
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1290,113 +1329,113 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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 "Başlığı ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 msgid "The version of the title to be used for sorting. "
 msgstr "Başlık sürümü sıralama için kullanılır. "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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 "Ekitap açıklamasını ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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 "Ekitap yayıncısını ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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 "Ekitabın bağlı olduğu seriyi ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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 "Kitabın serideki indeksini ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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 "Derecelendirmesini ayarla. 1 ve 5 arasında bir sayı olmalı."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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 "Kitabın ISBN'ini ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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 "Kitap için etiketleri ayarla. Virgül ile ayrılmış liste olmalı."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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 "Kitap üreticisini ata."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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 "Dili ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "Arşiv içerisinde e-kitap bulunamadı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
 msgstr ""
 "Seri içerisindeki sıra ve beğeni değeri sayı olmak zorundadır . Gözardı "
 "ediliyor."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr "Girdi HTML ye çevriliyor ..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr "E-kitap dönüştürmeleri çalışıyor ..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr "Oluşturuluyor"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1405,21 +1444,21 @@ msgid ""
 "turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1427,7 +1466,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1436,42 +1475,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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 "İçerik Tablosu:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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 "Kitabın girişine bir içerik tablosu ekleme ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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 "Kitabın girişine İçerik Tablosı ekle ."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1479,77 +1518,77 @@ msgid ""
 "pipeline."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr "\tHTML ayrıştırılıyor..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "İşleniyor %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr "\tBBeB'ye dönüştürülüyor..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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 "Dosya ayrıştırılamadı: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr "%s dosyası boş"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1557,76 +1596,76 @@ msgstr ""
 "Kötü tablo:\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr "LRF ayrıştırılıyor..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "XML oluşturuluyor..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /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/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1635,159 +1674,163 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr "Karikatür"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "Eser Adı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "Yazar(lar)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "Yayıncı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Yapımcı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "Açıklamalar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "Etiketler"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "Seriler"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "Dil"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "Zaman damgası"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "Yayınlandı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "Haklar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 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/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr "seçenekler"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1801,120 +1844,120 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr "Kitap kategorisini ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr "Yayın tarihini ayarla."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr "Dosya belirtilmedi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr "Kapak bulunmadı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "etiketler"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "description/reviews"
 msgstr "açıklamalar/değerlendirmeler"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1928,41 +1971,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "Aranacak kitabın yazarı."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "Aranacak kitabın başlığı."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr "Aranacak kitabın yayıncısı."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " bulunamadı."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -1970,166 +2013,162 @@ msgid ""
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "Kapak"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "Tüm makaleler"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Bu Amazon Topaz kitabı. İşlem yapılamaz."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
 msgid "Title Page"
 msgstr "Başlık Sayfası"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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 "İçindekiler"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "Telif Hakkı"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr "İthaf"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 msgid "List of Tables"
 msgstr "Tabloların Listesi"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "Notlar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "Önsöz"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Main Text"
 msgstr "Ana Metin"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "%s biçimli litaplar desteklenmiyor"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "İsimsiz"
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /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/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr "Dipnotlar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr "Yan Çubuk"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2137,32 +2176,32 @@ msgid ""
 "starts with an indent is reached."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /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/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2174,114 +2213,114 @@ msgid ""
 "Manipulate a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr "Yazar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr "Konu"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr "Oluşturan"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr "Sayfalar"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr "Dosya Boyutu"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr "PDF Sürümü"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2290,33 +2329,33 @@ msgid ""
 "Merges individual PDFs.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr "Birleştirme Seçenekleri:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr "Dönüştürme Seçenekleri:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2331,90 +2370,96 @@ msgid ""
 "Split a PDF.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /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/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /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/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2422,296 +2467,443 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr "Silmeden önce onayla"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr "Araç çubuğu simge boyutu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
 msgstr "Buton etiketlerini araç çubuğunda göster"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "Kopyalandı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "Kopyala"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "Panoya Kopyala"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "dosyaları Seç"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "Ekleniyor..."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr "Kitap yok"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 "Kitap bulunmadı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "Eklendi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "Ekleme başarısız"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "Kaydedildi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML Seçenekleri"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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 "çıktı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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 "Form"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr "E-kitap seçenekleri"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
 msgid "'Don't include this book' tag:"
 msgstr "'Bu kitabı içerme' etiketi:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
 msgid "'Mark this book as read' tag:"
 msgstr "'Bu kitabı okundu olarak işaretle' etiketi:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2720,135 +2912,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr "Numaraları metin gibi sırala"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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 "girdi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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 "Renklerin &Sayısı:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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 "&Geniş"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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 "&Yatay"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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 "&Sağdan sola"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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 "Sı&ralama"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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 "&Çıktı biçimi:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr "Hata Ayıklama"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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 "Hata ayıklama klasörü seçin"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr "Geçersiz hata ayıklama dizini"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr "Hata ayıklama dizin oluşturma başarısız"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2856,105 +3048,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr "EPUB Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " KB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr "FB2 Girdisi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr "FB2 Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -2970,732 +3122,736 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr "Belge &Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr "&Varsayılan değerleri kullan"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr "&Yazı Boyutu "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr "0.0 pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr "Gör & Hisset"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr "Orijinal"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr "Temel &Yazı Boyutu"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr "Satır &yüksekliği:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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 "Okuyamıyor"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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 "Dosyayı okuma izniniz yok: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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 "Dosya okumada hata"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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 "Kitap Kapağı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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 "&Başlık: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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 "&Yazar(lar): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr "Yazar Sı&ralaması:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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 "&Yayıncı: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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 "Et&iketler: "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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 "&Seriler:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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 "Serilerin listesi. Yeni seri ekleyebilirsiniz."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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 "Kitap "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr "Varsayılan"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "Sayfa Düzeni"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "Profil açıklaması"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr "&Girdi profili:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr "&Sol:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr "&Üst:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr "&Sağ:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr "&Alt:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr "PDB Girdisi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr "PDB Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr "&Biçim:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr "PDF Girdisi"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr "PDF Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr "&Kağıt Boyutu:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr "RB Çıktısı"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr "Kitap Aç"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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 "Test"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr "&Girdi biçimi:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3705,517 +3861,605 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
+#: /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/trunk/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
+#: /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/trunk/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
+#: /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/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr "&Başlık:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4223,32 +4467,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4259,327 +4503,343 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4589,121 +4849,234 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "Tarih"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4712,68 +5085,64 @@ msgid ""
 "by the empty string."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4781,128 +5150,123 @@ msgid ""
 "below."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -4910,615 +5274,801 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "&Tarih:"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5532,62 +6082,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5611,846 +6161,1005 @@ msgid ""
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr "Başlık:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "Boyut (MB)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:101
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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 "E-kitap aç"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "Kitaplar Ekle"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "Kitapları Sil"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "Diske kaydet"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr "&Tercihler"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /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/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/sidebar.py:84
+msgid "Hide Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6466,204 +7175,210 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6671,7 +7386,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6681,93 +7396,89 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "Disk'e kayıt edilemiyor"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6775,735 +7486,745 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 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/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /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/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /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/trunk/src/calibre/gui2/viewer/main.py:683
+#: /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/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7512,150 +8233,150 @@ msgid ""
 "Amazon account."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7663,45 +8384,56 @@ msgid ""
 "server."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:259
+msgid "yesterday"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
 msgstr ""
 
-#: /home/kovid/work/trunk/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:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7710,7 +8442,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7718,14 +8450,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7734,14 +8466,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7750,28 +8482,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7780,7 +8512,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7790,27 +8522,27 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7819,61 +8551,55 @@ msgid ""
 "fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7882,43 +8608,43 @@ msgid ""
 "the directory related options below.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -7927,11 +8653,11 @@ msgid ""
 "command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7940,15 +8666,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7958,11 +8684,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -7972,15 +8698,15 @@ msgid ""
 "id is an id number from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7993,11 +8719,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8008,27 +8734,27 @@ msgid ""
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8039,23 +8765,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8066,30 +8792,30 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8101,17 +8827,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8120,19 +8846,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8142,15 +8868,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8162,111 +8888,127 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr "Başlık"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr "Derece"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr "Tarih"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr "Yayınlanma Tarihi"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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/trunk/src/calibre/library/save_to_disk.py:57
+#: /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/trunk/src/calibre/library/save_to_disk.py:60
+#: /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/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8274,7 +9016,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8282,7 +9024,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8290,347 +9032,425 @@ msgid ""
 "saving to supports unicode."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "Başlıksız Yazı"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "Başlıksız Yazı"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "Besleme alınıyor"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -8638,39 +9458,39 @@ msgstr ""
 "Giriş başarısız , calibre Süreli servisleri için kullanıcı adınız ve "
 "şifrenizi kontrol ediniz ."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr "Siz"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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 "Zamanlanmış"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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 "Özel tanımlı"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -8678,38 +9498,38 @@ msgstr ""
 "Sunucu cevabı için, saniye olarak zaman aşımı bekleme süresi . Varsayılan : "
 "%default sn"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8718,6 +9538,12 @@ msgid ""
 "applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "CSS stil yüklemeyin"
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Sony PRS-600/700/900 eBook reader ile bağlantı kur"
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "Sony PRS-300/505/500 eBook reader ile bağlantı kur"
diff --git a/src/calibre/translations/zh_CN.po b/src/calibre/translations/zh_CN.po
index 89b7066c3d..cc8637b01b 100644
--- a/src/calibre/translations/zh_CN.po
+++ b/src/calibre/translations/zh_CN.po
@@ -7,181 +7,181 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:31+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:57+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-05-30 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "不做任何处理"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "基本目录"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "文件类型"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "元数据读取器"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "元数据生成器"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "类目生成器"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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 文件中的超链接并将所有链接的文件放入一个压缩文件内。该插件此后将在添加 HTML 文件到书库时自动运行。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:50
+#: /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-8859-1 和 utf-8。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -189,57 +189,57 @@ msgid ""
 msgstr ""
 "在 pmlname_img 或 images 目录下创建一个包含 PML 文件及所有图像的 PMLZ 归档。此插件在每次向书库添加 PML 文件时运行。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "从漫画文件中提取封面"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "读取 RAR 归档中电子书的元数据"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "读取 ZIP 归档中电子书的元数据"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "从 %s 文件设置元数据"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "转换输入"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -247,159 +247,159 @@ msgid ""
 "encoding declarations."
 msgstr "指定输入文件的编码格式。该设置将覆盖文档声明的编码格式。该设置对于未申明编码格式和申明错误编码格式的输入文件处理十分有用。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "转换输出"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "输入配置文件"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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 "该配置文件适用所拟 PRS 产品系列。如 500/505/600/700 等。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:69
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr "该配置文件适用索尼 PRS 300。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "该配置文件适用索尼 PRS-900。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "该配置文件适用 Microsoft Reader。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "该配置文件适用 Mobipocket 书籍。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "该配置文件适用翰林 V3 和类似设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "该配置文件适用翰林 V5 和类似设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "该配置文件适用 Cybook G3 设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "该配置文件适用 Cybook Opus 设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "该配置文件适用 Amazon Kindle。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "该配置文件适用 Irex Illiad 设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "该配置文件适用 IRex Digital Reader 1000 设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "该配置文件适用 IRex Digital Reader 800。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "该配置文件适用 B&N Nook。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "输出配置文件"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 "该配置文件适用 Kobo Reader。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "该配置文件适用索尼 PRS-300。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "该配置文件适用 5 英寸 JetBook 设备。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 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/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "该配置文件适用 Amazon Kindle DX。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "已安装插件"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "关联插件文件类型"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "本地插件定制"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "禁用插件"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "无有效插件位于 "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "插件 %s 初始化返回失败回溯："
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -411,447 +411,486 @@ msgstr ""
 "    通过加载外部插件定制 Calibre。\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "添加插件，指定包含其 zip 文件的路径。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "按名称移除自定义插件（对内置插件无效）。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "定制插件，指定插件名和自定制字符串，使用逗号分隔。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "列出全部已装插件"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "启用该名称插件"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "禁用该名称插件"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "与 Android 手机通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr "与 S60 手机通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+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 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "与黑莓智能手机通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /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/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "与 EB600 eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr "Entourage Edge"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr "与 Entourage Edge 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "与 ESlick eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "与翰林 V3 电子书通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "与翰林 V5 电子书通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "与 BOOX eBook reader 通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "与 Hanvon N520 eBook reader 通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "与 SpringDesign Alex 通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr "与 Azbooka 通信"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "与 Elonex EB 511 eBook reader 通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "与 IRex Iliad eBook reader 通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "与翰林 V3 电子书通信。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "与翰林 V5 电子书通信。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+msgstr "与 BOOX eBook reader 通信。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr "与 Hanvon N520 eBook reader 通信。"
+
+#: /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:67
+msgid "Communicate with the Azbooka"
+msgstr "与 Azbooka 通信"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr "与 Elonex EB 511 eBook reader 通信。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "与 IRex Digital Reader 1000 eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "与 IRex Digital Reader 800 通信"
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "与 Iriver Story 阅读器通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "与 JetBook eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "与 Kindle eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "与 Kindle 2 eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "与 Kindle DX 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr "与 Kobo Reader 通信"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr "与 Palm Pre 通信"
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr "与  通信"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "与诺基亚 770 网络平板通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "与诺基亚 810 网络平板通信."
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "Nook"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "与 Nook 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "与 Nuut2 电子书阅读器通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "与 Sony PRS-500 eBook reader 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/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:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "与索尼 PRS-300/505/500 通信。"
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "传输书籍到设备中..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "未命名"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "正在从设备中删除书籍..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "正在传输元数据到设备..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "与索尼 PRS-600/700/900 eBook reader 通信。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr "与三星 SNE 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "与 Teclast K3 通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "无法检测到 %s 磁盘，请重启后重试。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "无法检测 %s 挂载点。请尝试重启。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "无检测测到 %s 磁盘。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr "无法找到帮助程序：%s。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr "无法检测到 %s 磁盘驱动器。您的内核可能正在输出已经废弃的 SYSFS 版本。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "无法装载主存储器（错误代码：%d）"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr "设备中未插入存储卡."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "选定的插槽：%s 未被支持。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "设备内置存储空间不足"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "存储卡空间不足"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "新闻"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "配置设备"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "设备磁盘盘符设置"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr "设备支持的格式列表"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "从设备上的文件中读取元数据"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "控制书籍保存方式的模板"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "额外定制"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "与电子书阅读设备通信。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "获取设备信息..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "将书籍添加到设备的元数据列表中..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "将书籍从设备的元数据列表移除中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "正在传输元数据到设备..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [options] mybook.chm"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "输出目录。默认为当前目录"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr "包含评论 txt 文件的路径。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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 "从LRF文件中提取预览"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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 "从 LRF 文件中提取封面。由于 LRF 格式未定义封面元素，程序将使用智能查找功能。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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 "设置书籍ID"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr "设定字体 delta"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr "渲染 %s 成功"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "处理 %s 失败"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
@@ -861,81 +900,81 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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 "图像转换灰度级别。默认：%default 。若您转换 EPUB 格式漫画，256 以下的数值可能造成设备上显示的文本模糊。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:283
+#: /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/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "禁用锐化。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "不对图片进行处理"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -974,65 +1013,65 @@ msgstr ""
 "\n"
 "转换系统完整文档请参见\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "输入选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr "处理输入文件 %s 的控制选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "输出选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "设置输出 %s 的处理控制选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "控制自动检测文档结构。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "设定输出中元数据的选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "用于调试转换的选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr "列出公告板订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr "输出到"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1040,7 +1079,7 @@ msgid ""
 "are:"
 msgstr "设置输入配置文件. 该配置文件让程序了解如何解析输入文件并进行转换. 例如页面分辨率(i.e. 以像素为单位). 可选项有："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1050,7 +1089,7 @@ msgstr ""
 "设置输出配置文件. 该配置文件让程序了解如何转换输出目标文件并为目标设备进行优化. 在某些情况下, "
 "特定设备的文件格式需要该输出配置文件来定义如何生成其特定格式. 例如EPUB文件在SONY reader设备上. 可选项有:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1060,7 +1099,7 @@ msgstr ""
 "基准字体尺寸(pts)。所有输出文件中的文字将以此为基准进行缩放。选择一个较大的基准字体可以将所有文字相应放大，反之亦然。在默认情况下，程序根据您选择的输"
 "出配置文件来设定基准字体尺寸。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1071,17 +1110,17 @@ msgstr ""
 "将CSS字体名称映射为以pts为单位的字体大小. 例如12,12,14,16,18,20,22,24. 这些设置是从xx-small到xx-"
 "large的对应映射, 最后的大小作为做对应的最大字体的映射. 程序用这些尺寸进行只能文字字体缩放. 程序默认使用输出配置文件中指定的映射关系."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr "关闭字体缩放功能。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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 "行高(pts)。控制连续行之间的空隙大小，默认情况下程序不调整行高大小。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1090,45 +1129,45 @@ msgid ""
 msgstr ""
 "一些布局不佳的源文件使用表格来控制页面布局可能会导致输出文件中的正文超过页面范围。本选项设定程序将内容从表格中提取出并以线型布局排列输出。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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 "用XPath表达式设置将被添加到文件第一级目录的标签. 该选项将关闭其他的对应自动检测功能."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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 "用XPath表达式设置将被添加到文件第二级目录的标签. 这些第二级目录将被添加到上一个第一级目录下方."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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 "需要添加到书籍目录3级项的匹配XPath表达式. 所有查找到的对应项会被添加到上一个2级目录项下."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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 "如果少于默认上限的章节数被检测到, 这些章节的链接将被添加到文件目录. 默认值; %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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 "
@@ -1136,13 +1175,13 @@ msgid ""
 msgstr ""
 "输出文件目录中的最多链接项数量。设置为 0 表示关闭。默认值：%default。只有在检测到的章节数量小于该阈值时这些链接项才会被添加到目录中。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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 "从目录中移除匹配该证则表达式的链接项, 它们的子项也会被同时移除M."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1156,7 +1195,7 @@ msgstr ""
 "\"part\"的项或者任何含有class=\"chapter\"的标签作为章节标题。该表达式必须为一组元素列表。关闭本功能，使用表达式\"/\"。更多关"
 "于 XPath 表达式的信息请查阅 Calibre 用户手册中的 XPath 章节部分."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1166,39 +1205,39 @@ msgstr ""
 "设置标注章节的模式. \"pagebreak\"模式会在章节前插入下一页控制符. \"rule\"模式会在章节前插入空行. "
 "\"none\"模式不会在章节前插入控制. \"both\"模式会在章节前插入下一页控制符和空行."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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 "CSS 样式表或 raw CSS 文件路径。该 CSS 样式表将会被添加到源文件的样式规则中，它可以覆盖输入文件中已定义的相同样式。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr "XPath 表达式。在指定元素前插入分页符。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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 "设置上边距(pts)。默认值为 %default。注意：72 pts 等于 1 英寸"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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 "设置下边距(pts)。默认值为 %default。注意：72 pts 等于 1 英寸"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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 "设置左边距(pts)。默认值为 %default。注意：72 pts 等于 1 英寸"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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 "设置右边距(pts)。默认值为 %default。注意：72 pts 等于 1 英寸"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1207,73 +1246,73 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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 "移除段落之间的空行. 同时设置段落缩进为1.5em. 如果源文件不使用段落标记 (<p>或者<div>标签)程序将不执行段落空行移除."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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 "calibre 移除段间距后，会自动设置段落缩进，保证区分段落。此选项控制缩进宽度。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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 "在章节之间插入空行. 如果源文件不使用章节标记 (<p> 或 <div> 标记) 本选项将不起作用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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 "从指定 OPF 文件中读元数据。读取的元数据将覆盖源文件中定义的其他元数据。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1287,7 +1326,7 @@ msgstr ""
 "(例如中文和日文所包含的相同汉字字符), 程序将使用多数用户使用的ASCII编码来进行替换 "
 "(在上面的例子中中文汉字ASCII字符将被使用而非日文汉字字符)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1297,111 +1336,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr "用以进行按作者排序的关键字符串. "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
 msgstr "设置封面为指定文件或 URL"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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 "设置评分。评荐值为 1 到 5 之间的数字。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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 "设置书籍的 ISBN。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr "设定发布日期。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
 msgstr "设定书籍时间戳（calibre 中日期列使用）"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "无法在压缩文件中找到电子书籍"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr "解析日期/时间失败"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr "将输入转换为HTML中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr "正在对电子书籍进行转换..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr "正在创建"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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 "将生成EPUB文件的内容解压缩到指定文件夹. 请注意该文件夹会先被清空."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1412,7 +1451,7 @@ msgstr ""
 "关闭按分页符切割. 默认情况下, 程序会按分页符将输入文件切切分为多个文件. 由此程序可以使用较少的计算机资源来解析和输出结果. "
 "当然切分操作会增加处理时间, 如果输入文件含有较多的分页符, 请关闭此功能."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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 "
@@ -1421,14 +1460,14 @@ msgstr ""
 "将大于该大小 (以KB为单位) 的HTML文件切分. 由于很多EPUB阅读器无法打开巨大的文件, 故此功能十分有用. 默认值 %defaultKB "
 "是Adobe Digital Editions 的文件大小要求."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1436,7 +1475,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1445,42 +1484,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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 "在HTML文件中超链接遍历时使用广度优先算法. 默认情况下, 程序适用深度优先算法."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:250
+#: /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 "HTML文件中超链接遍历的最大深度. 该值必须为非负整数. 0 表示不进行超链接遍历. 默认值为 %default."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1490,66 +1529,66 @@ msgstr ""
 "通常该输入插件将重整源文件文件夹组织结构到标准文件夹组织结构. 如果您了解该如何手动完成此操作, 您可以打开本选项关闭自动文件结构重整, "
 "错误的操作将会导致整个转换操作队列失败."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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 "PDF 文件部分转换为 HTML，在此设定平均换行行宽。默认为 %default  即已禁用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr "从EPUB文件创建LIT文件..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr "\t检测到 Book Designer 文件。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr "\t正在解析 HTML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\t检测到Baen文件. 重新分析处理中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr "输出预处理 HTML 文件到 "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "正在处理 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr "\t正在转换为 BBeB 格式..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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 "无法分析处理文件: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr "%s 是一个空文件"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr "解析链接失败 %s %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr "无法将链接 %s 添加到文件目录"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
 msgstr "无法处理图片 %s. 错误: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr "无法处理隔行模式PNG文件 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1557,12 +1596,12 @@ msgstr ""
 "无法处理图片: %s\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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 "处理以下表格时发生错误: %s. 忽略该表格样式."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1570,23 +1609,23 @@ msgstr ""
 "错误表格：\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr "无法读取封面图片: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr "无法从源读取: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr "处理 opf 文件失败"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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"
@@ -1594,31 +1633,31 @@ msgstr ""
 "%prog book.lrf\n"
 "转换LRF文件到LRS (XML UTF-8 encoded)文件"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr "输出 LRS 文件"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr "解析 LRF 文件中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "创建 XML 文件中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr "输出 LRS 文件到 "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr "无法读取预览信息文件:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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."
@@ -1626,24 +1665,24 @@ msgstr ""
 "%prog [options] file.lrs\n"
 "将 LRS 文件编译为 LRF 文件。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr "输出文件路经"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
 msgstr "转换 LRS 到 LRS，对调试有用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr "无效 LRF 文件。无法设置元数据。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1657,159 +1696,163 @@ msgstr ""
 "显示/编辑 LRF 文件的元数据。\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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 "选择txt文本文件作为LRF格式电子书籍的注释"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
 msgstr "设置文字间隙，单位 pts。默认为 %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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 "设置页眉格式。%a 表示作者 %t 表示标题。默认值为 %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
 msgstr "在页眉下添加额外空行. 默认大小为 %default pt."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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 "最小段落缩进 (段落首行的缩进), 单位 pts. 默认值: %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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 "将HTML表格输出为图片 (对处理还有较大和复杂表格的文件有用)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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 "放大文字字体倍数. 默认值 %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr "将被内嵌的衬线字体集"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr "将被内嵌的sans-serif字体集"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr "将被内嵌的等宽字体集"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr "漫画"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "标题"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "作者"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "出版商"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "出品人"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "注释"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "标签"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "系列"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "语言"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "时间戳"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "发布于"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "权限"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr "编辑评论"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
 msgstr "从归档文件(zip/rar)解压一般电子书格式。同时试图自动检测是否 cbz/cbr 文件。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr "选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1833,120 +1876,120 @@ msgstr ""
 "元数据不被该文件类型所支持，该项元数据会被\n"
 "忽略。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr "使用指定文件作为封面."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr "设置书籍分类."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr "设定发布日期。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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 "指定 OPF 文件名。元数据会被写入 OPF 文件。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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 "从指定的 OPF 文件中读取元数据并将这些值写入电子书籍中。在命令行参数中指定的元数据可以覆盖 OPF 文件中的元数据"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr "设置 LRF 文件的 BookID"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr "未指定文件"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr "原始的元数据"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr "变更的元数据"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr "OPF 文件创建在"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr "存储封面到"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr "没有找到封面"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "元数据下载"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr "评分"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "标签"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr "下载 %s 来自 %s"
 
-#: /home/kovid/work/trunk/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/trunk/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 "从 isbndb.com 下载元数据"
 
-#: /home/kovid/work/trunk/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 "您需在 isbndb.com 注册%s免费帐户%s并在之下填写您的访问密钥才能访问。"
 
-#: /home/kovid/work/trunk/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 "从 amazon.com 下载社会性元数据"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1969,41 +2012,41 @@ msgstr ""
 "密钥是您在 isbndb.com 注册免费账户时创建的账户密钥。\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "待查找书籍的作者。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "待查找书籍的标题。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr "待查找书籍的出版商。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr "访问 LibraryThing.com 超时。请稍后再试。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " 无法找到。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr "LibraryThing.com 服务器错误。请稍后重试。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -2015,166 +2058,162 @@ msgstr ""
 "\n"
 "通过书籍的ISBN从LibraryThing.com获得书籍的封面图片\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "封面"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr "修改图片以适应 Palm 设备的屏幕尺寸。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr "按作者排序时使用作者排序，如果该字段为非空。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr "不压缩文件内容。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "所有文章"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "这是一部 Amazon Topaz 书籍。无法处理。"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr "索引"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr "词汇表"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr "致谢"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "参考文献"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr "末页"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "版权"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr "献辞"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr "题辞"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr "前言"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "注释"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "序言"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "不支持 %s 格式电子书"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr "HTML 目录生成选项。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr "书封皮"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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 "无法找到合理的切分点: %s 子树大小: %d KB"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "未命名"
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr "OPF/NCX 等文件生成选项。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr "生成的 OPF 文件版本。默认值为 %default 。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
 msgid ""
 "Generate an Adobe \"page-map\" file if pagination information is available."
 msgstr "如果分页信息存在则生成Adobe页所略图文件."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr "脚注"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr "侧边栏"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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 "一般情况下，Calibre 会将空行识别为段落分隔。而此选项将假定每个空行都代表一个段落。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2183,32 +2222,32 @@ msgid ""
 msgstr ""
 "Calibre 一般将空行作为段落标记。使用此选项将假定有缩进（一个 tab 或者两个以上空格）的行代表一段文字的开始。下一个缩进之前的内容为段尾。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
 msgstr "PDB文件使用的容器格式. 可选项有:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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 "设置输出文件使用的编码格式. 默认值为cp1252. 并非所有格式支持本选项功能."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr "不从文件中提取图片"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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 "用以设置自动换行的比例. 合法的比例值为0到1之间的小数. 默认值为中间值0.5."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr "使用新 PDF 转换引擎。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2228,7 +2267,7 @@ msgstr ""
 "\n"
 "Manipulate a PDF.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2238,34 +2277,34 @@ msgstr ""
 "\n"
 "对PDF文件切边.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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 "切边页面左侧横向切除的像素数 (默认值为 %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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 "切边页面左侧纵向切除的像素数 (默认值为 %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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 "切边页面右侧横向切除的像素数 (默认值为 %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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 "切边页面右侧纵向切除的像素数 (默认值为 %s)"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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`"
@@ -2273,21 +2312,21 @@ msgstr ""
 "由ghostscript生成的文件, 它可以按以下命令按页单独切边 `gs -dSAFER -dNOPAUSE -dBATCH -"
 "sDEVICE=bbox file.pdf 2> bounding`"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr "切边选项:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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 "控制PDF转换的选项"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
 msgid ""
 "[options] file.pdf password\n"
 "\n"
@@ -2297,11 +2336,11 @@ msgstr ""
 "\n"
 "解密 PDF 文件。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr "解密选项:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
 msgid ""
 "[options] file.pdf password\n"
 "\n"
@@ -2311,11 +2350,11 @@ msgstr ""
 "\n"
 "加密 PDF 文件。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr "加密选项:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21
 msgid ""
 "file.pdf ...\n"
 "\n"
@@ -2325,31 +2364,31 @@ msgstr ""
 "\n"
 "获取 PDF 文件信息。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr "作者"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr "主题"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr "创建者"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr "页数"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr "文件大小"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr "PDF 版本"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2363,11 +2402,11 @@ msgstr ""
 "\n"
 "合并多个 PDF 文件.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr "合并选项："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2377,11 +2416,11 @@ msgstr ""
 "\n"
 "反转一个PDF文件.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr "反转选项："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
 msgid ""
 "file.pdf degrees\n"
 "\n"
@@ -2391,11 +2430,11 @@ msgstr ""
 "\n"
 "顺时针旋转PDF文件.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr "旋转选项："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2421,48 +2460,48 @@ msgstr ""
 "\n"
 "切分PDF文件.\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr "切分选项："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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 "尺寸单位. 默认使用英寸. 可选项有 %s 注意: 该选项不能覆盖页边界的单位!"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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 "纸张大小. 该选项将覆盖输出配置文件中的值. 默认值为letter. 可用选项有 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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 "修改页面尺寸. 格式为 宽度x高度, 例如 `123x321` 来设定页面宽度和高度. 该设置将覆盖其他相同设置."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr "设置页面方向. 默认为纵向页面. 可选项有 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr "无法找到 pdftohtml，请确认其已被加入系统路径变量 PATH 中"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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 "指定输出文档的字符编码。默认为 cp1252。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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"
@@ -2471,29 +2510,35 @@ msgstr ""
 "RTF 文件有 calibre 不支持的特性。先转换到 HTML 再试。\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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 "指定输出文档的字符集编码。默认为 utf-8。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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 "指定压缩级别。范围 1-10。1 为最低级别，压缩过程最快；10为最高压缩率，但压缩过程更长。"
 
-#: /home/kovid/work/trunk/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 "用 markdown 预处理运行文本输入。了解更多关于 markdown 信息参见"
 
-#: /home/kovid/work/trunk/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 "输出文本中不插入目录。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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'. "
@@ -2502,13 +2547,13 @@ msgstr ""
 "设置换行符的类型. 可选项有 %s. 默认选项为 'system'. 使用'old_mac' 来兼容 Mac OS 9和之前版本的操作系统. 对Mac "
 "OS X使用 'unix'选项. 'system' 选项会使用操作系统默认的换行符."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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 "设置输出文件使用的编码格式. 默认使用utf-8. 注意: 该选项将应用于所有输出格式."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2517,296 +2562,443 @@ msgid ""
 msgstr ""
 "每行最多容纳字符数。程序将会自动寻找行中最后一个空格换行。如果行内无空格，则行宽将会超过超越此值，在下个空格处换行。此外，最小值为25。使用 0 禁用分行"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr "删除前确认"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr "工具栏图标大小"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr "主窗口位置尺寸"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr "按欢迎度排序标签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr "转换到LRF文件的默认选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr "查看LRF文件的选项"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "将封面显示在单独的窗口而不是在 Calibre 主窗口"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "将并发任务最大值限制为 CPU 数量"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "已复制"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "复制"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "复制到剪贴板"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "选择文件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "添加中..."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "路径错误"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr "没有书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 "未找到书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "已添加"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "添加失败"
 
-#: /home/kovid/work/trunk/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 "添加书籍进程似乎已死。请尝试重启 Calibre 并分步添加书籍，直到定位出问题的书籍。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "发现重复"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "添加副本..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "正在保存..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "已保存"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML 选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr "输出中索包含的域："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr "电子书选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr "类目"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr "附加笔记标签前缀："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2815,135 +3007,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr "包含\"标题\"部分"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr "包含\"最近添加\"部分"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr "将数字做文本处理"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr "catalog.ui 的 Tab 模板"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr "批量转换"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr "漫画输入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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 "颜色数(&N):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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 "关闭图像规范化(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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 "保持宽高比(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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 "关闭锐化(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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 "关闭切边(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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 "宽度(&W)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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 "横向(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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 "从右向左(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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 "不要排序(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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 "除噪点(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr "关闭漫画处理(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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 "输出格式(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101
 msgid "Disable conversion of images to &black and white"
 msgstr "禁用图像黑白转换(&b)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr "调试"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr "调试转换过程。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr "无效调试目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr "创建调试目录失败"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2951,105 +3143,65 @@ msgid ""
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr "选择文件夹放置调试输出。如果您选择文件夹，将在期内放置众多调试输出。这对了解转换过程和找到正确转换参数（如目录和章节检测）很有用。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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 "调试过程会输出转换各个阶段种生成的中转 HTML。此 HTML 常可以作为手动编辑转换的起点。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr "EPUB 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr "不要在分页符上进行切分(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr "无默认封面(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr "w"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr "切分超过此大小的文件(&L)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " KB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr "FB2 输入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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 "不要在书籍开始插入目录(&T)。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr "FB2 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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 "内置目录(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr "字体缩放向导"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -3065,505 +3217,505 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr "输出文档(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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 "基准字体大小(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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 "字体大小 Key(&K)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr "使用默认值(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr "输入文档(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr "字体大小： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr " 将映射到大小： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr "0.0 pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr "外观"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr "关闭文字大小缩放(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr "基准字体大小(&f):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr "行高(&H)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr "输入字符编码(&E)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr "删除段间空行(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr "缩进大小："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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 "<p>calibre 移除段间距后，会自动设置段落缩进，保证区分段落。此选项控制缩进宽度。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr " em"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr "文本对齐："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr "线性化重整表格(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr "额外CSS样式(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr "插入空行(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr "LRF 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr "自动旋转过宽图片(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr "文字间距(&W)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr "最小段落缩进(&I)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr "将表格渲染为图片(&t)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr "添加页眉(&H)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr "页首分割(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr "页眉格式(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr "内嵌字体(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr "衬线字体(&S)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr "Sans-seif 字体(&A)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr "等宽字体(&M):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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>读取此文件时发生错误：<br/><b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr "使用该源文件作为封面(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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 "改变封面图像(&C)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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 "标题(&T)： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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 "作者(&A): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr "按作者排序(&r):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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 "出版商(&P):： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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 "标签(&g): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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 "电子书籍的分类标签. 此标签对于数字搜索非常有用. <br><br>该标签可以是词语或短语, 使用逗号分隔."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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 "系列(&S)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr "MOBI 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr "默认"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr "书籍目录标题(&T)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr "为 Palm 设备缩放图片(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr "使用作者项作为按作者排序索引(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr "禁用文件内容压缩"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr "Kindle 选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr "期刊主标题字体："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr "个人文档标签："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr "输出配置文件(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "配置文件描述"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr "输入配置文件(&I)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr "页边距"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr "左(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr "上(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr "右(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr "底(&B):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr "PDB 输入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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 "将每行文字作为段落处理(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr "PDB 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr "格式(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr "PDF 输入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr "不折行系数(&U)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr "无图像(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr "PDF 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr "纸张大小(&P)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr "纸张方向(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr "RB 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 "选择格式进行查看"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr "打开书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr "正则表达式生成器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr "预览"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr "正则表达式："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr "转换"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr "仅针对特定输入格式的选项。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr "输入格式(&I)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr "为指定书籍使用已存转换设定(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
@@ -3571,72 +3723,72 @@ msgstr ""
 "结构\n"
 "检测"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr "检测章节位置（XPath 表达式）："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr "之前插入分页位置（XPath 表达式）："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr "页眉正则表达式："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr "页脚正则表达式："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr "无效正则表达式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr "无效正则表达式：%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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 "无效 XPath"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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 表达式 %s 无效。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr "章节标记(&M)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr "移除首个图像(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Insert &metadata as page at start of book"
 msgstr "书籍开始页面插入元数据(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
 msgid "&Preprocess input file to possibly improve structure detection"
 msgstr "预处理输入文件，尽可能改善文档结构检测(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr "移除脚注(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr "移除头注(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
@@ -3644,51 +3796,51 @@ msgstr ""
 "内容\n"
 "目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr "&一级目录（XPath 表达式）："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr "&二级目录（XPath 表达式）："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr "&三级目录（XPath 表达式）："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /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/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "章节开始(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "强制使用自动生成目录(&F)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "目录过滤(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr "TXT 输入"
 
-#: /home/kovid/work/trunk/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 "使用 markdown 处理"
 
-#: /home/kovid/work/trunk/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 "
@@ -3697,106 +3849,110 @@ msgstr ""
 "<p>Markdown 是一种简单的文本标记语言，允许进行高级格式化。了解更多在 <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>。"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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 "TXT 输出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr "行尾风格(&L)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr "最大行宽(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr "强制最大行宽"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
 msgid "Use a wizard to help construct the XPath expression"
 msgstr "使用向导帮助构建 XPath 表达式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr "用标签名匹配 HTML 标签(&T)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr "*"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr "a"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr "br"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr "div"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr "h1"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr "h2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr "h3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr "h4"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr "h5"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr "h6"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr "hr"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr "span"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr "拥有属性(&A)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr "值为(&V)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr "（一条正则表达式）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3810,322 +3966,383 @@ msgstr ""
 "高级用法参见 <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath "
 "教程</a>。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "无详情可用。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr "设备未连接。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr "获取设备信息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr "获取设备书籍列表"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr "从设备抓取注释"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr "传输元数据到设备上"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr "上传 %d 本书到设备"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr "从设备上删除书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr "从设备上下载书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr "查看设备上的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "并从书库中删除"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr "设置传送到设备的默认动作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr "发送邮件至"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr "传送到主内存"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr "发送到存储卡 A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr "发送到存储卡 B"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-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/trunk/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:412
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+msgid "Storage Card A"
+msgstr ""
 
-#: /home/kovid/work/trunk/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:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+msgid "Storage Card B"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr "抓取注释（实验功能）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr "选择传送"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr "选择传送到设备的格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr "无设备"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr "无法传送：无连接设备"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr "无卡"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr "无法传送：设备中无储存卡"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "电子书："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr "已添加, 您可以从中获取电子书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr "由"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr "使用 %s 格式."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr "正在发送邮件至"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr "无合适格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr "在发送电子邮件之前自动转换下列书籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "由于无法找到合适的文件格式无法通过电子邮件发送下列书籍:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr "发送电子书籍失败"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr "无法通过电子邮件发送以下书籍:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr "已通过邮件发送:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr "新闻:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr "附加"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr "将新闻发送到"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "上传到设备之前自动转换如下书籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr "正在发送类目到设备。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr "将新闻传送到设备."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr "传送书籍到设备。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr "设备存储空间不足"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>由于设备存储空间不足无法将书籍传送到设备上 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr "为此设备选择可用格式和格式顺序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr "使用子目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr "保存模板(&T)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "路径"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "封面适配视图(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr "上一个(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr "下一个(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr "我的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr "为 {0} 本书生成类目"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr "类目格式(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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 "类目标题(&T)（若当前已有类目标题则替换）："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr "自动发送类目到设备(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr "类目选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "选择格式"
 
-#: /home/kovid/work/trunk/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 "设置漫画文件的转换选项 (CBR/CBZ files)"
 
-#: /home/kovid/work/trunk/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 "设置转换 %s 的选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr "标题(&T);"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr "作者(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr "配置文件(&P);"
 
-#: /home/kovid/work/trunk/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 "%(plugin_type)s %(plugins)s"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
 "\n"
 "Customization: "
@@ -4133,23 +4350,23 @@ msgstr ""
 "\n"
 "自定义： "
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
@@ -4157,11 +4374,11 @@ msgstr ""
 "电子邮件\n"
 "传输"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
@@ -4169,164 +4386,191 @@ msgstr ""
 "内容\n"
 "服务器"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "如选中, 下载的新闻奖自动被发送到 <br>该邮件地址 (使用列出的支持格式之一)."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr "系统端口选定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "错误"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr "安装命令行工具失败。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "命令行工具已安装"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr "命令行工具安装于"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr "如果您移动 calibre.app，您必须重新安装命令行工具。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "不合法的插件路径"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s 不是合法的插件路径"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "选择插件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "该插件不能被禁用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "插件: %s 不能被禁用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "无法个性化插件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "插件: %s 无需个性化设置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "定制"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "不能移除内置插件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " 无法移除. 该插件是内置插件. 您可以尝试禁用它而非移除."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "错误日志:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "访问日志:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "无法启动内容服务器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "选择书籍位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "无效的尺寸"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "尺寸大小 %s 不合法. 合法的格式为 宽度x高度"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "不合法的数据库路径"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "不合法的数据库路径 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>必须是文件目录."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "不合法的数据库路径.<br>无法写入到 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr "检查数据库完整性"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "检查数据库完整性失败"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "找到部分不一致"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4334,32 +4578,32 @@ msgid ""
 "folder directly."
 msgstr "下列书籍使用格式曾经在数据库中，现已不可用。格式项被移除。您需手动检查。这可能是由于您直接在 library 文件夹操作文件引起的。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr "标签Widget"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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 "在此处您可以控制 Calibre 如何从您添加的文件读取元数据。Calibre 可从文件内容读取元数据，也可以从文件名读取。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:105
 msgid "Read metadata only from &file name"
 msgstr "从文件名读取元数据(&F)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr "交换作者姓和名(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4370,327 +4614,343 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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 "如果找到相似标题和作者的书籍，自动合并新文件(&m)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr "从文件名配置元数据(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr "添加书籍(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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 "此处您可控制 Calibre 在您点击“保存到磁盘”时的保存行为："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr "分别保存封面(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr "更新保存版本的元数据(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr "使用 OPF 文件保存元数据(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr "日期格式为(&D)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr "保存文件格式为(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr "用下划线替换空格(&U)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr "将路径名改为小写(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr "保存书籍(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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 "在此控制 calibre 发送到设备时的存储方式。首选项 -> 插件 中定义单个设备接口插件可以覆盖此处设置。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr "发送到设备(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "首选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr "选择新的数据库路径"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr "新版程序可用时提示(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "默认下载社会性元数据（标签、评分等）(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "默认抓取元数据覆盖作者和标题(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr "默认网络超时(&t)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr "设置网络访问的默认超时限制 (例如在从互联网获取信息时的超时)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " 秒"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr "选择界面语言, 需重启(&l):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "普通"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr "高"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr "低"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr "进程优先级(&p):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr "首选输出格式(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr "首选输入格式顺序(&I)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr "使用罗马数字作为序列数(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr "显示系统托盘图标, 需重启生效(&t)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr "在系统托盘除显示和提醒"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 "在单独的窗口显示封面浏览界面, 需重启生效(&b)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "即时搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "自动将下载的新闻传输到电子书阅读器上(&n)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "在将新闻传送到设备上后从书库中删除(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "浏览模式下显示的书籍封面数量(&N), 须重启生效;"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "工具栏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr "工具栏按钮大小(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr "在工具栏显示按钮文字(&t)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr "选择在书库界面中显示的新系列(&c)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "使用内部浏览器显示"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr "将电子邮件地址添加到书籍发送目的"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "添加邮件地址(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr "设为默认(&d)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr "删除邮件地址(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "等待中的工作进程最大值（需要重启）(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr "检查数据库完整性(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr "安装命令行工具(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr "打开 calibre 配置目录(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "显示最大并发任务数为可用 CPU 核心数(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr "调试设备检测(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "服务器端口(&p):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr "显示书籍封面的最大尺寸(宽度x高度). 过大的封面将会被相应缩小. "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "最大封面大小(&c):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr "每次请求最大 OPDS 项(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "启动服务器(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr "停止服务器(&o)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr "测试服务器(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr "在系统启动时自动启动服务器(&a)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "查看服务器日志(&s)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4704,121 +4964,234 @@ msgstr ""
 "http://myhostname:8080 作为新类目。此时 myhostname 应该为有效主机名，或者您 Calibre 程序所运行计算机的 IP "
 "地址。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr "从可以通过配置插件的启用与否来调整Calibre的功能特性."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "启用/禁用插件(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr "定制插件(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr "移除插件(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr "添加插件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr "插件文件(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr "添加(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr "基于标签创建栏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr "查找名称"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr "栏头"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr "栏类型"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr "使用括号"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr "值可编辑"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr "是"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr "否"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr "文本"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr "数字"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "日期"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr "书籍标签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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 "注释性文字在 create_ct_column.py 添加"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr "复制到剪贴板(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr "调试设备检测"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr "无效模板"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr "模板 %s 无效："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr "保存模板(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4829,68 +5202,64 @@ msgstr ""
 "通过调整下面模板，您可以控制文件名及其存储目录。您可以使用 / "
 "字符代表子文件夹。下面列出可用元数据变量。如果一本书缺少一些元数据，变量将被空白字符串代替。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr "可用变量："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr "正在下载社会性元数据，请稍候..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "您确定吗？"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr "一直显示此警告信息(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "错误"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "按作者排序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr "正在寻找元数据..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr "无法找到元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr "警告"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr "无法从如下位置抓取元数据："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr "未找到元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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 "未找到元数据，请修改标题作者或 ISBN 搜索条件后重试。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr "获取元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4900,128 +5269,123 @@ msgstr ""
 "<p>Calibre 可以以下两个服务器获取书籍的元数据：<b>Google Books</b> 和 <b>isbndb.com</b>。<p>若使用 "
 "isbndb.com 您必须注册<a href=\"http://www.isbndb.com\">免费账户</a> 并在下方填写您的访问密码。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr "访问密码(&A)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr "抓取"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr "匹配项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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 "为选定书籍下载社会性元数据（标签、评分等）(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr "任务信息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr "活动任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr "停止选中任务(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr "显示任务信息(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr "停止所有任务(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:22
-msgid "Editing meta information for %d books"
-msgstr "为 %d 部书籍编辑元信息"
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "编辑元信息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "元信息"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr "自动设置作者排序(&u)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr "作者排序(&O)： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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 "指定如何按书籍作者姓名排序。如 Charles Dickens 会被作为 Dickens, Charles 进行排序。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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 "评分(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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 "为该书评分。0-5 星"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr "无变更"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr "添加标签(&G)： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr "移除标签(&R)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr "移除格式(&R)”"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr "对调作者和书名(&W)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -5032,431 +5396,489 @@ msgstr ""
 "如果您选定书籍 A 之后选定书籍 B，\n"
 "书籍 A 为 1 号，B 为 2 号。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr "为此系列自动数字排序"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "书籍"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "无法从 %s 格式中读取元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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 "无法从 %s 格式中读取封面"
 
-#: /home/kovid/work/trunk/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 "%s 格式中封面无效"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr "ISBN 编号有效"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr "ISBN 编号无效"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr "正在下载封面..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr "无法抓取封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>无法抓取封面。</b><br/>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr "下载超时。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "无法找到书籍对应的封面。请尝试首先指定 ISBN。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "非法封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr "封面不是有效图片"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr "出错"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr "下载社会性元数据出错"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr "无法抓取元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "您必须设定 ISBN，标题，作者或出版商中的至少一个条件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr "权限拒绝"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr "无法打开 %s。它是否被其它程序占用。"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "作者排序：(&O) "
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "ISBN(&B)："
 
-#: /home/kovid/work/trunk/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 "出版于(&D)："
 
-#: /home/kovid/work/trunk/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 "dd MMM yyyy"
 
-#: /home/kovid/work/trunk/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 "日期(&D) :"
 
-#: /home/kovid/work/trunk/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/trunk/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 "从服务器抓取元数据(&F)"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "下载封面(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr "需要密码"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr "正在中止..."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "%d 天 %d 小时 %d 分钟前"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 "无法下载新闻，无活动网络连接"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr "立即下载所有计划中的订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr "下载所有计划任务(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr "介绍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr "计划下载(&S)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "天"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "星期一"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "星期二"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "星期三"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "星期四"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "星期五"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "星期六"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "星期日"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr "在"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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 "订阅清单下载间隔。0 表示每小时下载该订阅清单。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr "账户(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr "若需执行计划任务，请保持 Calibre 一直运行。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr "日程表(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr "添加标题作为标签(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr "附加标签(&E)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr "高级(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr "立即下载(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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 "设置删除已下载的超过一定天数旧新闻。天数为 0 表示从不删除旧新闻。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr "删除已下载的旧新闻，过期天数 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "含"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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>不符合此条件。即仅列出<b>不</b>符合该条件的项目。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr "条件否"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr "搜索包含..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr "所有下列关键字(&A)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr "精确匹配关键字(&P)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr "包含一个或多个下列关键字(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr "搜索结果不包含..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr "搜索结果不包含任何以下关键字(&U)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr "使用何种匹配："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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"
@@ -5464,185 +5886,313 @@ msgstr ""
 "参见<a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
 "interface\">用户手册</a>获取更多帮助"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr "选择格式"
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
 msgstr "下列标签被更多书籍使用。您确认要删除么？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "标签编辑器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "可用标签(&V)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr "将标签应用到当前书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr "已应用的标签(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr "将标签从当前书籍上移除"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr "添加标签(&A)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr "发送测试邮件，从 %s 至："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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 "测试(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr "未选择订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
 msgid "The attached file: %s is a recipe to download %s."
 msgstr "附件文件：%s 为订阅清单，用以下载 %s。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr "订阅清单用于 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr "源必须有名称"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr "源必须有名称"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr "源必须有 URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr "源 %s 必须有 URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr "已存在"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:186
 msgid "This feed has already been added to the recipe"
 msgstr "该 Feed 已被加入订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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>无法创建订阅清单。错误：<br>%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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 "名为 %s 的自定义订阅清单已存在。是否覆盖？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr "选取订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr "选取订阅清单进行自定义"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr "请选择订阅清单文件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr "添加自定义新闻来源"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr "可用的用户订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr "添加/更新订阅清单(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr "移除订阅清单(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr "共享订阅清单(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr "定制内置订阅清单(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr "从文件载入订阅清单(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5664,52 +6214,52 @@ msgstr ""
 "right:0px; -qt-block-indent:0; text-indent:0px;\">创建一个订阅清单并添加 RSS 源。<br "
 "/>对于大部分源，您需要使用 \"高级模式\" 来进一步设定抓取流程。</p></body></html>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr "订阅清单标题(&T)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr "最老文章(&O)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr "待下载的最老文章"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr "每个源的最多文章数(&M)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr "订阅清单中的 Feed"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr "从订阅清单中移除 Feed"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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 "将 Feed 加入订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr "源名称(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr "源网址(&U):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr "添加源(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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>"
@@ -5717,11 +6267,11 @@ msgstr ""
 "创建高级新闻订阅清单的帮助信息，在<a "
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">用户订阅清单</a>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr "订阅清单源代码(python)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5763,846 +6313,1005 @@ msgstr ""
 "weight:600;\">测试</span>功能，在小样本的文件名中测试您的正则表达式。各种元数据条目的组名已列在提示中。</p></body></ht"
 "ml>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr "正则表达式(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr "文件名(&N)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr "标题："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "正则表达式 (?P&lt;title&gt;)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr "无匹配"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr "作者："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr "正则表达式 (?P<author>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr "系列："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr "正则表达式 (?P<series>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr "系列索引："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr "正则表达式 (?P<series_index>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr "ISBN："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr "正则表达式 (?P<isbn>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr "任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "状态"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "进度"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr "运行时间"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr "有 %d 个正在运行的任务："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr "未知任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr "有 %d 个正在等待执行的任务："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr "无法中止任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "无法在与设备通信时中止任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr "任务已执行"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr "不可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr " - 任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "大小 (MB)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "评分"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "无"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "书籍 <font face=\"serif\">%s</font> 中 %s."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr "格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+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
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "不允许"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr "不支持直接托拽到设备中。请首先将书籍添加到 Calibre 书库中。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "格式"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr "双击<b>编辑</b>该项<br><br>"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr "配置查看程序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr "使用白色背景"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr "连字符"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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>配置修改会在程序下次启动后生效.</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr " - LRF 查看程序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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>无结果项</b> 匹配关键词 <i>%s</i> 被找到."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr "LRF 查看器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr "解析 LRF 文件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr "LRF 查看程序工具栏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr "下一匹配项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr "配置"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /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/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr "创建书库失败"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /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/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 书库"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr "为您的新 calibre 电子书库选择位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "错误数据库位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr "错误数据库位置 %r。calibre 将退出。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr "数据库损坏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr "正在修复数据库。若容量大则时间将非常长"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr "错误数据库位置 %r。将新建空白 calibre 书库"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr "如果您确定它没有运行"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "无法开始 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s 正在运行。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr "可能在系统栏中运行，在"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr "屏幕右上区域。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr "屏幕右下区域。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "尝试重启电脑。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "尝试删除文件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr "在 ui.py 中设定"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "高级搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "搜索(&S)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr "在 ui.py 中设定"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr "重置快速搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr "选择已存搜索或输入新存入搜索名称"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr "当前搜索文本（取代搜索名称）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr "以框中名称保存当前搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr "删除当前已存搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "按流行度排序(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr "匹配任一"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr "匹配所有"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "添加书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "移除书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "编辑元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "发送到设备"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "保存到磁盘"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "抓取新闻"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "转换电子书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "查看"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "打开包含目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "显示书籍详情"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "同作者的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "同系列的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr "同出版商的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "同标签的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr "配置 Calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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 "重定向控制台输出到对话窗口（含 stdout 和 stderr）。在 GUI 程序无输出流的 Windows 上十分有用。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr "首选项(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr "退出(&Q)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr "错误：未处理例外"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr "书籍既没有标题也没有 ISBN 编号"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr "未找到匹配此书信息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "按任意键..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr "已经指定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr "已经指定给"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
 msgid "&Default"
 msgstr "默认(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr "定制快捷键为"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr "按键"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr "双击改变"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr "框架"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr "定制(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr "快捷键(&S)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr "其它快捷键(&A)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr "任务："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr "点击查看活动任务。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
-msgstr "点击浏览书籍封面"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr "点击关闭封面浏览"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:206
-msgid ""
-"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-"module failed:<br>"
-msgstr "<p>已禁用封面浏览。<br>导入图片流模块失败：<br>"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Hide Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
-msgstr "点击浏览书籍标签"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "作者"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "出版商"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr "搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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 "转换 %d 本书中的第 %d 本 (%s)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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 "由于未找到适用源格式，无法转换 %d 本书中的 %d 本。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr "为批处理排队书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "正在排队 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr "抓取新闻来源于 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr "转换现有"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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 "下列书籍已经被转换为 %s 格式。您希望转换它们么？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr "将单格式存入磁盘"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr "已存搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr "与设备通信发生错误"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "恢复(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "捐款赞助 Calibre 项目(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr "弹出已连接设备(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "重启(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
 msgstr "<p>帮助参见：<a href=\"%s\">用户手册</a><br>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr "逐个修改元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr "批量修改元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr "下载元数据和封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr "仅下载元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr "仅下载封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr "仅下载社会性元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr "合并到第一本选定书籍 - 删除其它"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr "合并到第一本选定书籍 - 保留其它"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr "从单个目录添加书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "添加空书。（无任何格式）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr "保存到磁盘单个目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 "仅保存 %s 到磁盘"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr "查看特定格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr "移除选定书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr "移除选定书籍中指定格式的书..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr "移除所有格式选定书籍，除..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr "移除选定书籍封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr "分别转换"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr "批量转换"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr "在您 calibre 书库中创建书籍类目"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr "运行欢迎向导"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr "类似书籍..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre 快速上手指南"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "用封面浏览"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr "（所有书籍）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
-msgstr "（找到 %d 部）"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "设备： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " 被检测到。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "已连接 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "设备数据库损坏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6627,204 +7336,210 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 "仅使用书库"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 "仅使用主书库生成注释"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 "未选择书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr "未选定书籍抓取注释"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr "将用户注释合并到数据库"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr "%s<br />最后已读页：%d (%d%%)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr "%s<br />最后已读页：位置 %d (%d%%)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr "<b>位置 %d &bull; %s</b><br />%s<br />"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr "<b>页数 %d &bull; %s</b><br />"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr "<b>位置 %d &bull; %s</b><br />"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "多少空白书籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr "应添加多少空白书籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 "正在上传书籍到设备。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "EPUB 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "LRF 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "HTML 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "LIT 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "MOBI 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr "Topaz 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "文本书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "PDF 书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "漫画"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "归档"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "支持的书j"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr "合并一些书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr "找到一些重复内容，并入如下已有书籍："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "无法读取元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr "无法从下列项目读取元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "无法删除"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 "未选择书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "选择删除格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "选择<b>非</b>删除格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 "选定书籍将被<b>永久删除</b>，文件会从您的电脑中移除。是否确定？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "从设备删除书籍。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "无法下载元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "社会性元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "正在为 %s 本书下载 %s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "下载一些元数据失败"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr "下载下列书籍元数据失败："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "下载元数据失败。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 "无法编辑元数据"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 "无法合并书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr "合并需要选定至少两本书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6832,7 +7547,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6842,46 +7557,46 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 "您将要合并多余 5 本书。<b>是否</b>确定？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "无法保存到磁盘"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "选择目标目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "保存出错"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "保存时出错。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 "无法保存一些书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr "点击显示详情按钮查看具体哪些。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr "未选定书籍生成类目"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "正在生成 %s 类目..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -6889,48 +7604,44 @@ msgstr ""
 "没有书籍收入类目\n"
 "检查不含标签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "已经生成类目。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "输出类目目录"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "选定目标位置 %s.%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "正在抓取新闻，来源于 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " 已抓取。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "无法转换"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr "开始转换 %d 本书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "无法查看"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr "无法打开文件夹"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "选定多本书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6938,66 +7649,79 @@ msgid ""
 "continue?"
 msgstr "您正在试图打开 %d 本书籍。同时打开太多书籍可能会变慢，并对电脑响应速度有消极影响。一旦开始，需等待进程完成。是否继续？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr "无法打开文件夹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s 无可用格式。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "无法配置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr "有正在运行任务时无法进行配置。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "无可用详细信息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr "设备上书籍没有详细信息可用。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "设备通讯错误。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 "与设备通讯出现临时性错误。请拔下再重新连接设备，或可能需要重启。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "转换错误"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr "清单禁用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>失败</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "仍有任务运行。您是否希望退出？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7007,28 +7731,28 @@ msgstr ""
 "                      退出可能导致设备损坏。<br>\n"
 "                      确定退出么？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "警告：正在运行任务"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 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/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "有可用更新"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -7036,385 +7760,385 @@ msgstr ""
 "%s 已经更新到版本 %s。参见<a href=\"http://calibre-ebook.com/whats-"
 "new\">新功能</a>。访问下载页面么？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr "编辑书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr "新书签标题："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr "导出书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr "已存书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr "导入书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr "Pickle 书签(*.pickle)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr "名称"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr "书签管理器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr "操作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr "编辑"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr "删除"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr "重置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr "导出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr "导入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr "配置电子书查看器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr "字体选项(&F)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr "衬线字体(&R)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr "Sans 字体(&S)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr "等宽字体(&M)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr "默认字体大小(&D)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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 " px"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr "等宽字体大小(&F)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr "标准字体(&T)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr "衬线"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr "Sans-serif"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr "等宽"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr "记住上次使用窗口大小(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr "最大查看宽度："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170
 msgid "H&yphenate (break line in the middle of large words)"
 msgstr "断词分行(&Y)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr "默认断词分行语言(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
 msgstr "调整大于查看器窗口的图像大小（需要重启）(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr "用户样式表(&U)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr "一般(&G)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr "双击变更一个键盘快捷键"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr "键盘快捷键(&K)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr "未找到结果："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr "定制电子书查看器的选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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 "设定用户 CSS 样式表。它将可以定制所有书籍外观。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr "查看器最大窗口宽度像素数。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr "断词分行文本"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr "默认使用断词分行规则的语言"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr "字体选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr "衬线字体"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr "Sans-serif 字体"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr "等宽字体"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr "标准字体大小 px 值"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr "等宽字体大小 px 值"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr "标准字体类型"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr "词典查询(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr "下一节"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr "上一节"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr "文档起始"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr "文档结尾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr "节起始"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr "节末尾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr "后翻一页"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr "前翻一页"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr "翻到下一部分"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr "翻到上一部分"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr "翻到部分低端"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr "翻到部分顶端"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr "翻到文档结尾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr "翻到文档开头"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr "下翻"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr "上翻"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr "左翻"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr "右翻"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr "书籍格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr "书内位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr "书内文本搜索"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "正在链接 dict.org 查询：<b>%s</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr "选择电子书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr "电子书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr "添加书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr "编辑书签标题："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr "未找到 %s 的匹配"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr "正在加载流..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr "正在排布流 %s..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr "管理书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr "正在加载电子书..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr "DRM 错误"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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>此书被 <a href=\"%s\">DRM</a> 保护"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr "无法打开电子书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr "电子书查看器控制选项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Print javascript alert and console messages to the console"
 msgstr "在控制台显示 javascript 警告以及控制台信息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:683
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:683
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -7424,91 +8148,91 @@ msgstr ""
 "\n"
 "查看一本电子书。\n"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr "E-Book 查看程序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr "选择词典"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr "工具栏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr "下一页"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr "上一页"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr "增大字体大小"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr "减小字体大小"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr "查找下一个"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr "找到下一项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr "F3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr "复制到剪贴板"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr "引用模式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr "书签"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr "开关全屏"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr "打印"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr "找到前一项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr "找到前一项"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr "Shift+F3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr "打印电子书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr "复制图像"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr "粘贴图像"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
@@ -7518,7 +8242,7 @@ msgstr ""
 "%d\n"
 "本书"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
@@ -7528,7 +8252,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
@@ -7538,7 +8262,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
@@ -7548,43 +8272,47 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr "点击查看电脑上可用书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr "点击查看阅读区主存储中的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr "点击查看阅读器存储卡 A 中的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr "点击查看阅读器存储卡 B 中的书籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr "大小写转换"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr "大写"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr "小写"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr "转换大小写"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr "标题大写"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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 "
@@ -7592,13 +8320,13 @@ msgid ""
 msgstr ""
 "若您使用 Android 手机上的 WordPlayer 电子书程序，您可以用设备直接访问您的 Calibre 书库。这需要您打开内容服务器。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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 "请记住保持 Calibre 运行，如此它才能一直提供服务。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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 "
@@ -7607,92 +8335,85 @@ msgstr ""
 "您需要将 URL http://myhostname:8080 添加到您 WordPlayer 中的 Calibre 书库。此处 myhostname "
 "应为有效主机名或者您运行 Calibre 电脑的 IP 地址。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr "正在移动书库..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr "无效数据库"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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 "<p>在 %s 已有无效书库，在试图移动现有书库前删除它。<br>错误：%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr "无法移动书库"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr "欢迎向导"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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 "欢迎使用 Calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr "生产商(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr "设备(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr "向导页"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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 "<h2>祝贺您！</h2>您已成功设置 Calibre。点击 %s 按钮应用您的设定。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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 ""
 "<h2>演示视频</h2>calibre 功能展示<a href=\"http://calibre-ebook.com/demo\">在线视频</a>。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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>用户手册</h2>用户手册<a href=\"http://calibre-ebook.com/user_manual\">在线</a>可查。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7704,150 +8425,150 @@ msgstr ""
 "href=\"http://gmail.com\">gmail 账户</a>，点击下方使用 gmail 按钮。 您需要将您的 gmail "
 "账户信息注册到您的 Amazon 账户。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr "Kindle 邮件(&K)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr "选择您的语言(&L)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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 "为您的书籍选择位置。当您在 Calibre 中添加书籍，它们将被复制到这里："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr "变更(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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 "如果您已有 Calibre 书库，它将被复制到新位置。若 Calibre 书库在新位置已经存在，Calibre 将直接使用它。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
 msgstr "使用：%s:%s@%s:%s 和 %s 加密"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr "正在发送..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr "邮件已发出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr "完成 gmail 设定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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 "请勿忘记输入您的 gmail 用户名密码。您可于 http://gmail.com 注册免费账号"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr "您需要设置发信人电子邮件地址"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr "发信人地址(&f)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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>邮件发件人栏中将填写：Calibre 发送的邮件。<br> 将其设为您的邮件地址"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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>如果收件人的邮箱只能接收来自著名邮件服务的的邮件，使用邮件服务器则非常实用。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr "邮件服务器(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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 可<b>选择是否使用</b>邮件服务器以发送邮件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr "主机名(&H)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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 "您的邮件服务器的主机名. 例如 smtp.gmail.com"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr "端口(&P)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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 "您的邮件服务器的侦听端口号。默认 25"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr "您在邮件服务器上的用户名"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr "您在邮件服务器上的密码"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr "显示(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr "加密(&E)："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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 "连接到邮件服务器时使用 TLS 加密，这是通常服务器使用的选项。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr "&TLS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
 msgid "Use SSL encryption when connecting to the mail server."
 msgstr "连接到邮件服务器时使用 SSL 加密。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr "&SSL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr "使用 Gmail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr "测试邮件发送(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7858,45 +8579,56 @@ msgstr ""
 "href=\"http://www.lexcycle.com/download\">Stanza</a> 电子书程序，可以直接从设备访问您的 "
 "Calibre 书库。需要打开 Calibre 内容服务器。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr "打开内容服务器(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
-msgstr "Calibre 内容服务器控制设定"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
+msgstr ""
 
-#: /home/kovid/work/trunk/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/caches.py:259
+msgid "yesterday"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
-msgstr "服务器超时秒数。默认为 %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
+msgstr ""
 
-#: /home/kovid/work/trunk/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/caches.py:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
-msgstr "是定密码限制访问。默认访问为无限制。"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
-msgstr "访问用用户名。默认为 %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
-msgstr "显示封面最大大小。默认为 %default。"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:26
-msgid ""
-"The maximum number of matches to return per OPDS query. This affects Stanza, "
-"WordPlayer, etc. integration."
-msgstr "每次 OPDS 请求所返回的匹配数。此设置影响 Stanza、WordPlayer 等程序整合。"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7905,7 +8637,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7913,14 +8645,14 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "
@@ -7929,14 +8661,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7945,28 +8677,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -7975,7 +8707,7 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "
@@ -7985,20 +8717,20 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "Calibre 书库路径。默认为使用设定中存储的路径。"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
@@ -8008,7 +8740,7 @@ msgstr ""
 "\n"
 "列出 Calibre 数据库中可用书籍。\n"
 
-#: /home/kovid/work/trunk/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"
@@ -8020,7 +8752,7 @@ msgstr ""
 "可用域：%s\n"
 "默认：%%default。特殊域 \"all\" 可以用来选择所有域。仅对文本输出格式有效。"
 
-#: /home/kovid/work/trunk/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"
@@ -8030,54 +8762,48 @@ msgstr ""
 "可用域：%s\n"
 "默认：%%default"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr "输出数据格式。可用选择：%s。默认纯文本。"
-
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "下列书籍已经存在于数据库，未被田间（参见 --duplicates 选项）："
 
-#: /home/kovid/work/trunk/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"
@@ -8089,43 +8815,43 @@ msgstr ""
 "\n"
 "添加指定文件为书籍到数据库。您可以指定目录，参见目录相关选项。\n"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr "递归处理目录"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "设定添加空白书籍的 ISBN"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8139,11 +8865,11 @@ msgstr ""
 "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"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8155,15 +8881,15 @@ msgstr ""
 "\n"
 "将 ebook_file 中电子书添加到可用格式，用于通过 id 识别的逻辑书。您可以使用 list 命令得到 id。如果格式已经存在，将被替换。\n"
 
-#: /home/kovid/work/trunk/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 "您必须指定一个 id 和电子书文件"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8180,11 +8906,11 @@ msgstr ""
 "be a file extension like LRF or TXT or EPUB. If the logical book does not "
 "have fmt available, do nothing.\n"
 
-#: /home/kovid/work/trunk/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 "你必须指定一个 id 和格式"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8199,15 +8925,15 @@ msgstr ""
 "显示 Calibre 中通过 id 识别书籍数据库中存储的元数据。\n"
 "id 是来自 list 命令的 id 编号。\n"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr "以 OPF 表单(XML)打印元数据"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr "您必须指定一个 id"
 
-#: /home/kovid/work/trunk/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"
@@ -8226,11 +8952,11 @@ msgstr ""
 "存储。id 为 list 命令返回 id 数字。您可以将 --as-opf 参数用于 show_metadata\n"
 "命令，感受一下 OPF 格式。\n"
 
-#: /home/kovid/work/trunk/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 "你必须指定一个 id 和元数据文件"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8246,27 +8972,27 @@ msgstr ""
 "导出操作保存所有格式书籍、封面和元数据（位于一个 opf 文\n"
 "件）。您可以通过 list 命令得到文件 id。\n"
 
-#: /home/kovid/work/trunk/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 "导出所有数据库中的书，忽略 id 列表。"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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 "你必须指定一个 id 或 %s 选项"
 
-#: /home/kovid/work/trunk/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"
@@ -8277,23 +9003,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8304,7 +9030,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8314,23 +9040,23 @@ msgstr ""
 "一旦声明，忽略 --search \n"
 "默认：全部"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "显示详细输出信息。有利调试"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8342,17 +9068,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "错误：您必须指定项目名称、id 和值。"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8361,19 +9087,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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 "您将失去栏 %r 中所有内容。是否确定(y/n)？ "
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr "y"
 
-#: /home/kovid/work/trunk/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"
@@ -8383,15 +9109,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8411,111 +9137,127 @@ msgstr ""
 "\n"
 "具体命令帮助：%%prog command --help\n"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>正在将旧数据库转移到位于 %s 的新数据库<br><center>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "正在复制<b>%s</b>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "正在压缩数据库"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "正在检查"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "正在检查缺失文件。"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "已检查 id"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr "标题"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr "作者"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr "标签"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr "系列"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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 "系列号。需要首位补零使用 {series_index:0>3s} 或 {series_index:>3s} 首位补空格"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr "评分"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr "出版商"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr "日期"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr "出版日期"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr "Calibre 内部 id"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr "控制磁盘存储的选项"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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 "一般来说，Calibre 将基于 Calibre 书库升级存储所存文件的元数据。这使保存到磁盘变慢一些。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:57
+#: /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 "一般来说，Calibre 将会把元数据写入单独的 OPF 文件，和原始电子书文件分开保存。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:60
+#: /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 "一般来说，Calibre 将把封面保存为单独文件，和原始电子书文件分开保存。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8523,7 +9265,7 @@ msgid ""
 "are: {%s}"
 msgstr "控制保存文件文件名和目录结构的模板。默认是 \"%s\" ，将书籍按照作者保存到各个子目录，文件名为标题作者。可用控制为：{%s}"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8531,7 +9273,7 @@ msgid ""
 "are: {%s}"
 msgstr "模板控制设备上的文件名和目录结构。默认为 \"%s\"，按作者分目录储存，文件名包含标题和作者。可用控量为：{%s}"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8540,29 +9282,63 @@ msgid ""
 msgstr ""
 "一般来说，Calibre 为文件名将所有非英文字符转换为英文对应字符。警告：若关闭此项，您可能保存文件出错，取决于您的文件系统是否支持 unicode。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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 "日期显示格式。%d - 日，%b - 月, %Y - 年。默认：%b, %Y"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr "将路径转为小写。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr "下划线替换空格。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr "请求格式不可用"
 
-#: /home/kovid/work/trunk/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 "Calibre 内容服务器控制设定"
+
+#: /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 "服务器超时秒数。默认为 %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 "同时工作线程最大值。默认为 %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 "访问用用户名。默认为 %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr "显示封面最大大小。默认为 %default。"
+
+#: /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 "每次 OPDS 请求所返回的匹配数。此设置影响 Stanza、WordPlayer 等程序整合。"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr "密码以访问您的 Calibre 书库。用户名为 "
 
-#: /home/kovid/work/trunk/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
@@ -8572,345 +9348,389 @@ msgstr ""
 "\n"
 "启动 Calibre 内容服务器。"
 
-#: /home/kovid/work/trunk/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/trunk/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 "指定文件写进程 PID"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr "%s用法%s：%s\n"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr "创建者 "
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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 "向 %prog 传递包含空格的参数时，确保使用引号。"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr "isbndb.com 的访问密钥"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr "已停止"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr "已完成"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr "工作中..."
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙语"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr "英语（英国）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr "中文（香港）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr "英语"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr "英语（澳大利亚）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr "英语（新西兰）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr "英语（加拿大）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr "英语（印度）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr "英语（泰国）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr "英语（塞浦路斯）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr "英语（巴基斯坦）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr "英语（新加坡）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr "英语（也门）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr "英语（冰岛）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr "西班牙语（巴拉圭）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr "德语（奥地利）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr "荷兰语（荷兰）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr "荷兰语（比利时）"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr "URL 必须有 scheme sftp"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr "host 必须为 user@hostname 形式"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr "开启 SSH 会话失败： "
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr "服务器认证失败：%s"
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr "控制邮件传递"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr "未知源"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "无标题文章"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr "从网络下载期刊内容"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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 "对订阅清单开发有用。强制  max_articles_per_feed 值为 2，最多下载 2 个 Feed。"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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 "不从 calire 服务器下载最新订阅清单"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr "未知新闻来源"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "订阅清单“%s”需要用户名与密码。"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "下载完成"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "下载下列文章失败："
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr "下载下列文章的某些部分失败："
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr " 自 "
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\t失败链接："
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "无法抓取文章。使用 -vv 选项运行察看原因。"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "正在抓取源..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "从索引页面获取了源"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "正在尝试下载封面..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr "正在生成刊头..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr "开始下载 [ %d 线程数]..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "新闻源下载到 %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "无法下载封面：%s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "正在从 %s 下载封面"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr "已下载刊头图像"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "无标题文章"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "已下载文章：%s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "下载失败文章：%s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "抓取源"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr "登录失败，检查您 calibre 期刊服务的用户名密码。"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr "您"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -8920,48 +9740,48 @@ msgstr ""
 "\n"
 "URL 举例为 http://google.com"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "URL 存储基目录。默认 %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "的带服务器响应的超时秒数。默认：%default s"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr "递归级别最大值。如链接跟踪深度。默认：%default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 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/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "连续抓取最小间隔秒数。默认为 %default s"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -8972,13 +9792,50 @@ msgstr ""
 "任何匹配此正则表达式的链接都会被忽略。此选项可被多次使用，此时只要任一正则表达式有匹配链接，链接都被忽略。默认情况下，没有链接被忽略。如果 --"
 "filter-regexp 和 --match-regexp 均被使用，则优先应用 --filter-regexp。"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "不下载 CSS 样式表。"
 
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "将unicode字符转换为ASCII字符."
 
+#~ msgid "Send specific format to storage card A"
+#~ msgstr "发送指定格式到存储卡 A"
+
+#~ msgid "Send specific format to storage card B"
+#~ msgstr "发送指定格式到存储卡 B"
+
+#~ msgid "Click to turn off Cover Browsing"
+#~ msgstr "点击关闭封面浏览"
+
+#~ msgid "Click to browse books by their covers"
+#~ msgstr "点击浏览书籍封面"
+
+#~ msgid "Click to browse books by tags"
+#~ msgstr "点击浏览书籍标签"
+
+#~ msgid ""
+#~ "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+#~ "module failed:<br>"
+#~ msgstr "<p>已禁用封面浏览。<br>导入图片流模块失败：<br>"
+
+#~ msgid ""
+#~ "The format in which to output the data. Available choices: %s. Defaults is "
+#~ "text."
+#~ msgstr "输出数据格式。可用选择：%s。默认纯文本。"
+
+#~ msgid "and delete from library"
+#~ msgstr "并从书库中删除"
+
+#~ msgid "Send specific format to main memory"
+#~ msgstr "传送特定格式到主内存"
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "与索尼 PRS-300/505/500 通信。"
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "与索尼 PRS-600/700/900 eBook reader 通信。"
+
 #~ 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 "
@@ -8986,5 +9843,11 @@ msgstr "不下载 CSS 样式表。"
 #~ msgstr ""
 #~ "数值 <b>%d</b> 是您为内容服务器选定的系统端口。您的操作系统<b>可能</b>不允许服务使用此端口。安全起见，请选择 1024 以上的端口。"
 
+#~ msgid "Editing meta information for %d books"
+#~ msgstr "为 %d 部书籍编辑元信息"
+
 #~ msgid "Merge books"
 #~ msgstr "合并书籍"
+
+#~ msgid "(%d found)"
+#~ msgstr "（找到 %d 部）"
diff --git a/src/calibre/translations/zh_TW.po b/src/calibre/translations/zh_TW.po
index 1b51a1e207..6197e378a5 100644
--- a/src/calibre/translations/zh_TW.po
+++ b/src/calibre/translations/zh_TW.po
@@ -7,180 +7,180 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-29 18:54+0000\n"
-"PO-Revision-Date: 2010-05-28 23:27+0000\n"
+"POT-Creation-Date: 2010-06-05 01:06+0000\n"
+"PO-Revision-Date: 2010-06-04 16:40+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-05-30 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
 msgstr "完全不做任何事"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:54
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:58
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:204
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:101
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:332
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:921
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:818
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:980
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:108
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:583
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:862
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:865
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:419
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:441
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:969
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1697
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:311
-#: /home/kovid/work/trunk/src/calibre/library/database.py:913
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:248
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:260
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:680
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:717
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1111
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1113
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1235
-#: /home/kovid/work/trunk/src/calibre/library/server.py:671
-#: /home/kovid/work/trunk/src/calibre/library/server.py:747
-#: /home/kovid/work/trunk/src/calibre/library/server.py:794
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50
+#: /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/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/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: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/book/base.py:20
+#: /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/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:273
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:280
+#: /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/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/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/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/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/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
+#: /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/trunk/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
 msgstr "基本"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
 msgstr "檔案類型"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
 msgstr "元數據讀取器"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "元數據寫入器"
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "分類產生器"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:15
+#: /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/trunk/src/calibre/customize/builtins.py:50
+#: /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-8859-1 和 utf-8。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:57
+#: /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 "
@@ -189,57 +189,57 @@ msgstr ""
 "建立包含 PML 檔案和在 pmlname_img 或 images 目錄中所有圖片的 PMLZ 壓縮檔。這個外掛程式會在您每次將 PML "
 "檔案加入書庫時執行。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
 msgid "Extract cover from comic files"
 msgstr "從漫畫檔中擷取封面"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:306
+#: /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/trunk/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "從用 RAR 格式壓縮的電子書檔案中讀取詮釋資料"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "從用ZIP格式壓縮的電子書檔案中讀取詮釋資料"
 
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:391
+#: /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/trunk/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
 msgid "Set metadata from %s files"
 msgstr "從%s檔案中設定詮釋資料"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
 msgstr "轉換輸入"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:125
+#: /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 "
@@ -247,159 +247,159 @@ msgid ""
 "encoding declarations."
 msgstr "指定輸入文件的字元編碼。如果設定這個選項就會蓋過任何由文件本身宣告的編碼。當文件沒有宣告任何編碼或文件所宣告的編碼不正確時會很有幫助。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241
+#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
 msgstr "轉換輸出"
 
-#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255
+#: /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/trunk/src/calibre/customize/profiles.py:45
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
 msgstr "輸入設定檔案資料"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:49
+#: /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/trunk/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:258
+#: /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/trunk/src/calibre/customize/profiles.py:69
+#: /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/trunk/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:300
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "這個設定檔適用於 SONY PRS 900 電子書。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:330
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "這個配置文件適用於 Microsoft Reader。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:341
 msgid "This profile is intended for the Mobipocket books."
 msgstr "這個配置文件適用於 Mobipocket 書籍。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:354
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr "這個配置文件適用於翰林 V3 和類似設備。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "這個配置文件適用於翰林 V5 和類似設備。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:374
 msgid "This profile is intended for the Cybook G3."
 msgstr "這個配置文件適用於 Cybook G3 設備。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:387
 msgid "This profile is intended for the Cybook Opus."
 msgstr "這個配置文件適用於 Cybook Opus 設備。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:398
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "這個設定檔適用於 Amazon Kindle電子書。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:433
 msgid "This profile is intended for the Irex Illiad."
 msgstr "這個設定檔適用於 Irex Illiad。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:446
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr "這個設定檔適用於 IRex Digital Reader 1000 電子書。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:460
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:474
 msgid "This profile is intended for the B&N Nook."
 msgstr "這個設定檔適用於邦諾電子書"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
 msgid "Output profile"
 msgstr "輸出設定檔"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:230
+#: /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/trunk/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 ""
 
-#: /home/kovid/work/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:291
 msgid "This profile is intended for the SONY PRS-300."
 msgstr "這個設定檔適用於SONY 的PRS-300電子書"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:309
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "這個設定檔適用於JetBook出的5 英吋電子書"
 
-#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:318
 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/trunk/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:416
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "這個設定檔適用於Amazon Kindle DX"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Installed plugins"
 msgstr "已安裝的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Mapping for filetype plugins"
 msgstr "檔案類型外掛程式對應"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Local plugin customization"
 msgstr "本地外掛程式自訂設置"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Disabled plugins"
 msgstr "已關閉的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
 msgid "No valid plugin found in "
 msgstr "沒有在 中找到合適的外掛程式 "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
 msgid ""
 "    %prog options\n"
 "\n"
@@ -411,447 +411,486 @@ msgstr ""
 "    以載入的外部外掛程式自訂 calibre。\n"
 "    "
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "指定含有外掛程式的 zip 檔案的路徑來加入一個外掛程式。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "依名稱移除一個自訂的外掛程式。對內建外掛程式無效"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "自訂外掛程式。指定外掛程式的名稱以及用逗號分隔的自訂字串。"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
 msgid "List all installed plugins"
 msgstr "列出所有已安裝的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
 msgid "Enable the named plugin"
 msgstr "開啟已經命名的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
 msgid "Disable the named plugin"
 msgstr "關閉已經命名的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
 msgstr "和Android 為OS的電話交換資料"
 
-#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:39
+#: /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/trunk/src/calibre/devices/android/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:68
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+msgid "Communicate with iBooks through iTunes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:63
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr ""
+
+#: /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
+msgid "Updating device metadata listing..."
+msgstr ""
+
+#: /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
+msgid "%d of %d"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:248
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:969
+msgid "finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:421
+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:614
+#: /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:616
+#: /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:729
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
 msgstr "與 Binatone Readme eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
 msgstr "和黑莓機的電話交換資料"
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90
+#: /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 "Kovid Goyal"
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr "與 Cybook Gen 3 / Opus eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
 msgstr "與 EB600 eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
 msgstr "與 ESlick eBook reader 通訊。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "與翰林V3電子書通訊。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:78
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "與翰林V5電子書通訊。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:97
-msgid "Communicate with the BOOX eBook reader."
-msgstr "與 BOOX eBook 閱讀器連接。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "與 Hanvon N520 eBook 閱讀器連接。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:40
-msgid "Communicate with The Book 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 ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:51
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:67
-msgid "Communicate with the Azbooka"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:80
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "與 Elonex EB 511 eBook 閱讀器連接。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "與 IRex Iliad eBook 閱讀器連接。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
-
-#: /home/kovid/work/trunk/src/calibre/devices/interface.py:23
+#: /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/trunk/src/calibre/devices/irexdr/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "與翰林V3電子書通訊。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:90
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "與翰林V5電子書通訊。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:109
+msgid "Communicate with the BOOX eBook reader."
+msgstr "與 BOOX eBook 閱讀器連接。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr "與 Hanvon N520 eBook 閱讀器連接。"
+
+#: /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 "與 Elonex EB 511 eBook 閱讀器連接。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+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
+msgid "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 "與 IRex Digital Reader 1000 eBook reader 通訊。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
 msgstr "與 IRex Digital Reader 800 連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
 msgstr "與 Iriver Story 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
 msgstr "與 JetBook eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
 msgid "Communicate with the Kindle eBook reader."
 msgstr "與 Kindle eBook reader 通訊。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
 msgid "Communicate with the Kindle 2 eBook reader."
 msgstr "與 Kindle 2 eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
 msgid "Communicate with the Kindle DX eBook reader."
 msgstr "與 Kindle DX eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
 msgid "Communicate with the Kobo Reader"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "與 Nokia 770 internet tablet 連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
 msgstr "與 Nokia810 internet tablet 連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
 msgstr "The Nook"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
 msgstr "與 the Nook eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
 msgstr "與 Nuut2 eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr "與 Sony PRS-500 eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/trunk/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:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr "與 Sony PRS-300/505/500 eBook 閱讀器連接。"
-
-#: /home/kovid/work/trunk/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/trunk/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "正在傳送書籍到裝置中..."
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "未命名的"
 
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "正在從裝置中移除書籍..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "正在傳送元數據到裝置..."
-
-#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr "與 Sony PRS-600/700/900 eBook 閱讀器連接。"
-
-#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
 msgstr "與 Teclast K3 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:37
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "無法偵測到 %s 磁碟機。嘗試重新開機。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:427
 msgid "Unable to detect the %s mount point. Try rebooting."
 msgstr "無法偵測到 %s 掛載點。嘗試重新開機。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:492
 msgid "Unable to detect the %s disk drive."
 msgstr "無法偵測到 %s 磁碟機。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
 msgid "Could not find mount helper: %s."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:597
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr "無法偵測到 %s 磁碟機。您的核心可能使用了已廢棄的 SYSFS 版本。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:604
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr "無法裝載主記憶器（錯誤代碼：%d）"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:741
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:743
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "The reader has no storage card in this slot."
 msgstr "這個閱讀器的插槽中沒有記憶卡。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
 msgid "Selected slot: %s is not supported."
 msgstr "選取的插槽：%s 尚未支援。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
 msgid "There is insufficient free space in main memory"
 msgstr "主記憶體可用空間不足"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:780
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:782
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
 msgid "There is insufficient free space on the storage card"
 msgstr "記憶卡可用空間不足"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:812
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:818
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:843
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:589
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:995
+#: /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 "新聞"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
 msgstr "裝置設定"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
-msgid "settings for device drivers"
-msgstr "裝置驅動程式設定"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
-msgid "Ordered list of formats the device will accept"
-msgstr "這個裝置能使用的格式清單（依序排列）"
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:32
+#: /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/trunk/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Read metadata from files on device"
 msgstr "從裝置上的檔案讀取元數據"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
 msgid "Template to control how books are saved"
 msgstr "用來控制要如何儲存書籍的範本"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
 msgid "Extra customization"
 msgstr "額外自訂項目"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
 msgid "Communicate with an eBook reader."
 msgstr "與 eBook 閱讀器連接。"
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
 msgid "Get device information..."
 msgstr "取得裝置資訊..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:140
+#: /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
+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
+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
 msgid "Adding books to device metadata listing..."
 msgstr "將書籍加入裝置的元數據清單..."
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:170
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:242
+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
 msgid "Removing books from device metadata listing..."
 msgstr "將書籍從裝置的元數據清單移除..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
+msgid "Sending metadata to device..."
+msgstr "正在傳送元數據到裝置..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
 msgstr "%prog [options] mybook.chm"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
 msgstr "輸出目錄。預設為目前的目錄"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:47
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:49
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:51
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
 msgstr "含有註解的 txt 檔案路徑"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607
+#: /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 "從LRF文件中解出預覽"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:64
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:65
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:66
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611
+#: /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/trunk/src/calibre/ebooks/chm/reader.py:68
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613
+#: /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 "從 LRF 檔案解開封面。請注意 LRF 尚未定義封面，因此我們使用某種技巧來猜測封面。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615
+#: /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 "設定書籍 ID"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72
 msgid "Set font delta"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:201
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:201
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:204
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
 msgstr "失敗的 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:261
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
 "Failed to process comic: \n"
 "\n"
@@ -861,7 +900,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:279
+#: /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 "
@@ -869,74 +908,74 @@ msgid ""
 msgstr ""
 "灰階圖片轉檔的顏色數。預設值：%default。如果您想把漫畫轉換為 EPUB 格式，顏色數若少於 256 可能會造成在裝置上文字看起來變模糊了。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:283
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:283
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr "停用對圖片顏色範圍的標準化（增強對比）。預設值：False"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:286
+#: /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/trunk/src/calibre/ebooks/comic/input.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
 msgstr "停用銳化。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:290
+#: /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/trunk/src/calibre/ebooks/comic/input.py:293
+#: /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/trunk/src/calibre/ebooks/comic/input.py:295
+#: /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/trunk/src/calibre/ebooks/comic/input.py:298
+#: /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/trunk/src/calibre/ebooks/comic/input.py:302
+#: /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/trunk/src/calibre/ebooks/comic/input.py:305
+#: /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/trunk/src/calibre/ebooks/comic/input.py:309
+#: /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/trunk/src/calibre/ebooks/comic/input.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
 msgstr "不對圖片進行處理"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:315
+#: /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/trunk/src/calibre/ebooks/comic/input.py:452
-#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:463
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:19
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
 msgid ""
 "input_file output_file [options]\n"
 "\n"
@@ -977,65 +1016,65 @@ msgstr ""
 "\n"
 "需要轉換系統的完整文件請看\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
 msgstr "輸入選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
 msgid "Options to control the processing of the input %s file"
 msgstr "用來控制輸入 %s 檔案處理的選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
 msgid "OUTPUT OPTIONS"
 msgstr "輸出選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
 msgid "Options to control the processing of the output %s"
 msgstr "用來控制輸出 %s 處理的選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
 msgstr "控制文件結構的自動偵測。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145
+#: /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/trunk/src/calibre/ebooks/conversion/cli.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
 msgstr "用來設定輸出的元數據的選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
 msgstr "用來協助轉換程序除錯的選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256
 msgid "Output saved to"
 msgstr "將輸出儲存到"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:102
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:111
+#: /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. "
@@ -1043,7 +1082,7 @@ msgid ""
 "are:"
 msgstr "指定輸入設定檔。輸入設定檔會提供轉換系統關於如何轉譯輸入文件中各類資訊的方式。例如關係解析度的長度（以像素計的長度）。選擇有："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122
+#: /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 "
@@ -1053,7 +1092,7 @@ msgstr ""
 "指定輸出設定檔。輸出設定檔會告訴轉換系統如何將建立的文件為特定裝置進行最佳化。在某些情況，每一種裝置都需要一個輸出設定檔才能產生文件。例如 EPUB "
 "用於 SONY 閱讀器。選擇有："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133
+#: /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 "
@@ -1064,7 +1103,7 @@ msgstr ""
 "計算的基礎字型大小。在產生的電子書中所有的字型大小都會以這個大小為基礎來縮放。選擇較大的字型會使輸出的文件字型變大，反之亦然。預設的情形下，基礎字型大小是"
 "以您所選擇的輸出設定檔為準。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143
+#: /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-"
@@ -1076,17 +1115,17 @@ msgstr ""
 "small 到 xx-"
 "large，最後一個大小就會是最大的字型。字型縮放演算法會使用這些大小來適當的縮放字型。預設使用的映射方式是以您所選擇的輸出設定檔為準。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
 msgstr "關閉字體縮放功能。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162
+#: /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 "行高(pts)。控制連續行之間的空隙大小，預設情況下程式不調整行高大小。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170
+#: /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 "
@@ -1095,58 +1134,58 @@ msgid ""
 msgstr ""
 "有些設計不良的文件會使用表格來控制頁面文字的排版。在轉換這些文件時常會發生文字超出頁面的問題。這個選項會將表格的內容讀取出來，並重新以直線的方式呈現它。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180
+#: /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 "XPath 表示式指定的所有標籤都要加到第一級目錄中。如果有指定這個項目，它的優先權會超過任何自動偵測所排出的結果。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189
+#: /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 "XPath 表示式指定的所有標籤都要加到第二級目錄中。每個項目都會加入前一個一級目錄之下。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197
+#: /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 "XPath 表示式指定的所有標籤都要加到第三級目錄中。每個項目都會加入前一個二級目錄之下。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:213
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:220
+#: /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 "如果偵測到的章節少於這個數目，就會把連結加到目錄頁中。預設值：%default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227
+#: /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 "插入目錄頁的連結最大數量。設定為 0 代表停用。預設值：%default。只有在偵測到的章節數目少於這個臨界值時才會把連結加入目錄頁中。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:235
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:246
+#: /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 "
@@ -1159,7 +1198,7 @@ msgstr ""
 "class=\"chapter\" 標籤的 <h1> 或 <h2> 標籤。使用的表示式必須能解析出一份元素清單。要停用章節偵測，請使用 \"/\" "
 "表示式。請參閱 calibre 使用手冊的 XPath Tutorial 以取得使用這項功能的進一步資訊。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260
+#: /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 "
@@ -1169,39 +1208,39 @@ msgstr ""
 "指定如何標記偵測到的章節。「pagebreak」(分頁)會在每個章節前插入分頁符號。「rule」(水平線)會在每個章節前插入水平線。「none」(沒有)會"
 "停用章節的標記。「both」(兩者)則會同時加入分頁符號及水平線來標記章節。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270
+#: /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 "CSS 樣式表或原生 CSS 的路徑。這個 CSS 會添加到來源檔案的樣式規則中，因此可以用來覆蓋那些規則。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr "一個 XPath 表示式。換頁標籤會插入到指定的元素之前。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:285
+#: /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 "設置上邊距(pts)。預設值為 %default。注意：72 pts 等於 1 英吋"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:290
+#: /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 "設置下邊距(pts)。預設值為 %default。注意：72 pts 等於 1 英吋"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:295
+#: /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 "設置左邊距(pts)。預設值為 %default。注意：72 pts 等於 1 英吋"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:300
+#: /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 "設置右邊距(pts)。預設值為 %default。注意：72 pts 等於 1 英吋"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:306
+#: /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 "
@@ -1210,7 +1249,7 @@ msgid ""
 "Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316
+#: /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 "
@@ -1218,66 +1257,66 @@ msgid ""
 msgstr ""
 "移除段落之間的間距。同時將段落設定 1.5em 的縮排。如果來源檔案沒有使用段落（<p> 或 <div> 標籤），間距移除功能將不會有作用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:323
+#: /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 "當 calibre 移除段落間距時，它會自動為段落設定縮排，以確定能清楚的判斷段落。這個選項控制了縮排的寬度。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:330
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:336
+#: /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 "在章節之間插入空行. 如果來源檔案不使用章節標記 (<p> 或 <div> 標記) 本選項將不起作用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:351
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:359
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:367
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:374
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:380
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:387
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:394
+#: /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 "從指定的 OPF 檔案讀取元數據。從這個檔案讀取的元數據會覆蓋來源檔案中的任何元數據。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:401
+#: /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 "
@@ -1291,7 +1330,7 @@ msgstr ""
 "(例如中文和日文所包含的相同漢字字符), 程序將使用多數用戶使用的ASCII編碼來進行替換 "
 "(在上面的例子中中文漢字ASCII字符將被使用而非日文漢字字符)."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:416
+#: /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 "
@@ -1301,111 +1340,111 @@ msgid ""
 "instead."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:428
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:432
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:437
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
 msgstr "當以作者來排序會用這個字串來排序. "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
 msgstr "設定封面為指定的檔案或 URL"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:449
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:453
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:457
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:461
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:465
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64
+#: /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 "設定評等。應該為從 1 到 5 的數字。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:469
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66
+#: /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 "設定這本書的 ISBN。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:473
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:477
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:481
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:485
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
 msgstr "設定出版日期。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
 msgstr "設定書籍時間戳記（用於 calibre 日期欄位）。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
 msgstr "無法在壓縮文件中找到電子書籍"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:647
+#: /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/trunk/src/calibre/ebooks/conversion/plumber.py:654
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
 msgstr "解析日期/時刻失敗"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
 msgid "Converting input to HTML..."
 msgstr "將輸入轉換為HTML格式..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
 msgid "Running transforms on ebook..."
 msgstr "正在對電子書籍進行轉換..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
 msgid "Creating"
 msgstr "建立中"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56
+#: /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 "將產生EPUB文件的內容解壓縮到指定文件夾. 請注意該文件夾會先被清空."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:62
+#: /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 "
@@ -1416,7 +1455,7 @@ msgstr ""
 "關閉於分頁處分割。一般而言，輸入檔案會在每個分頁標籤的地方自動分割為兩個檔案。這樣會使輸出的電子書有更快的解析速度並耗費較少資源。然而，分割的動作是很慢的"
 "，尤其在您的來源檔案含有大量分頁標籤時，您應該關閉於分頁處分割的功能。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73
+#: /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 "
@@ -1425,14 +1464,14 @@ msgstr ""
 "將所有大於這個容量（以 KB 計）的 HTML 檔案分割。這是必要的，因為大部分 EPUB 閱讀器都不能處理大型的檔案。預設值為 "
 "%defaultKB，這也是 Adobe Digital Editions 要求的。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:80
+#: /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/trunk/src/calibre/ebooks/epub/output.py:86
+#: /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 "
@@ -1440,7 +1479,7 @@ msgid ""
 "blank page."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94
+#: /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 "
@@ -1449,42 +1488,42 @@ msgid ""
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:144
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77
+#: /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/trunk/src/calibre/ebooks/fb2/input.py:32
+#: /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/trunk/src/calibre/ebooks/fb2/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37
-#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35
+#: /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/trunk/src/calibre/ebooks/html/input.py:243
+#: /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/trunk/src/calibre/ebooks/html/input.py:250
+#: /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 "在追蹤 HTML 檔案時遞迴的最大層數。必須為非負數。0 表示在根 HTML 檔案中不追蹤任何連結。預設值為 %default。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:259
+#: /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 "
@@ -1494,66 +1533,66 @@ msgstr ""
 "通常這個輸入外掛程式會將所有的輸入檔案重新編排到一個標準的資料夾體系中。只有在您了解自己在做什麼的時候才使用這個選項，因為它可能會在接下來的轉換管線中造成"
 "各種討厭的副作用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:267
+#: /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 "如果 HTML 是由 PDF 檔轉換而來時斷行的平均長度。預設值為 %default，也就是將它停用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lit/from_any.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr "從EPUB文件建立LIT文件..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
 msgstr "\t偵測到 Book Designer 檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
 msgstr "\t正在分析處理 HTML..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\t偵測到 Baen 檔案。重新分析處理中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
 msgstr "輸出預處理 HTML 文件到 "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
 msgstr "正在處理 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
 msgstr "\t正在轉換為 BBeB 格式..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552
+#: /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 "不能分析檔案：%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
 msgstr "%s 是空的檔案"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
 msgstr "無法解析連結 %s %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
 msgstr "不能加入連結 %s 到目錄頁中"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
 msgstr "無法處理圖片 %s. 錯誤: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
 msgstr "無法處理交錯式 PNG %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1561,12 +1600,12 @@ msgstr ""
 "無法處理圖片: %s\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772
+#: /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 "處理以下表格時發生錯誤: %s. 忽略該表格樣式."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1574,23 +1613,23 @@ msgstr ""
 "錯誤表格：\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796
+#: /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/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
 msgstr "無法讀取封面圖片: %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
 msgstr "無法從%s讀取"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
 msgstr "處理 opf 文件失敗"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136
+#: /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"
@@ -1598,31 +1637,31 @@ msgstr ""
 "%prog book.lrf\n"
 "將 LRF 轉換為 LRS (XML UTF-8 編碼) 檔案"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
 msgstr "輸出 LRS 文件"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139
+#: /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/trunk/src/calibre/ebooks/lrf/lrfparser.py:158
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
 msgstr "分析 LRF 文件中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
 msgstr "建立 XML 文件中..."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
 msgstr "輸出 LRS 文件到 "
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
 msgstr "無法讀取預覽檔案:"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+#: /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."
@@ -1630,24 +1669,24 @@ msgstr ""
 "%prog [options] file.lrs\n"
 "將 LRS 編譯為 LRF 檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
 msgstr "輸出檔案的路徑"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:113
+#: /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/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
 msgstr "將 LRS 轉換為 LRS，有助於除錯。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
 msgstr "無效的 LRF 檔案。不能設定元數據。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
 "%prog [options] mybook.lrf\n"
 "\n"
@@ -1661,159 +1700,163 @@ msgstr ""
 "顯示/編輯 LRF 檔案中的元數據。\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603
+#: /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 "包含要儲存於 lrf 檔案的註解之 txt 檔案路徑。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:90
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
 msgstr "設定字詞的間距（以 pts 計）。預設為 %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97
+#: /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/trunk/src/calibre/ebooks/lrf/output.py:100
+#: /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 "設定頁首的格式。%a 會取代為作者而 %t 則代表標題。預設值為 %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:104
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
 msgstr "在頁首下加入額外的空間。預設值為 %default pt。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:107
+#: /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 "最小段落編排（於段落第一行的縮排，以 pt 計）。預設值：%default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:112
+#: /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 "將 HTML 中的表格繪製為圖片（當文件很大或表格很複雜時很有用）"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117
+#: /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 "在繪製出的表格文字乘上這個倍數。預設值為 %default"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
 msgstr "要內嵌的襯線字型族系的字型"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
 msgstr "要內嵌的無襯線字型族系的字型"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
 msgstr "漫畫"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:363
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:416
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
+#: /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/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
 msgid "Title"
 msgstr "書名"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:175
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:421
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1160
+#: /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:340
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:829
 msgid "Author(s)"
 msgstr "作者"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:180
+#: /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
 msgid "Publisher"
 msgstr "出版社"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:366
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "製作人"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:376
+#: /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
 msgid "Comments"
 msgstr "評論"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:366
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Tags"
 msgstr "標簽"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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: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
 msgid "Series"
 msgstr "系列"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:387
 msgid "Language"
 msgstr "語言"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:993
 msgid "Timestamp"
 msgstr "時間戳記"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:178
+#: /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
 msgid "Published"
 msgstr "發佈於"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
 msgid "Rights"
 msgstr "所有權"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
 msgstr "從壓縮檔 (zip/rar) 中解壓縮一般電子書格式。同時也自動偵測它們是否確實為 cbz/cbr 檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
 msgstr "選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1837,120 +1880,120 @@ msgstr ""
 "某些檔案類型所不支援的元數據，它們將會被默默的\n"
 "忽略掉。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:44
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:48
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
 msgstr "指定檔案來作為封面."
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
 msgstr "設定書籍分類。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
 msgstr "設定出版的日期。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77
+#: /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/trunk/src/calibre/ebooks/metadata/cli.py:80
+#: /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 "指定 OPF 檔案的名稱。元數據會寫入這個 OPF 檔案裡。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:83
+#: /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 "從指定的 OPF 檔案讀取元數據並使用它來設定電子書的元數據。在命令列中指定的元數據會覆蓋從 OPF 檔案讀取的元數據。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
 msgstr "設置 LRF 文件的 BookID"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
 msgstr "未指定檔案"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
 msgstr "原始的元數據"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
 msgstr "變更的元數據"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
 msgstr "OPF 文件創建在"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
 msgstr "儲存封面到"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
 msgstr "找不到封面"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:33
 msgid "Metadata download"
 msgstr "元數據下載"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "ratings"
 msgstr "評分"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:110
 msgid "tags"
 msgstr "標簽"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/metadata/fetch.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "Download %s from %s"
 msgstr "下載 %s 於 %s"
 
-#: /home/kovid/work/trunk/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 "從 Google 圖書下載元數據"
 
-#: /home/kovid/work/trunk/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 "從 isbndb.com 下載元數據"
 
-#: /home/kovid/work/trunk/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 "要使用 isbndb.com 您必須註冊一個 %s免費帳號%s 並在下面輸入您的存取金鑰。"
 
-#: /home/kovid/work/trunk/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 "從 amazon.com 下載社交網路元數據"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1973,41 +2016,41 @@ msgstr ""
 "key 是您在 isbndb.com 註冊了免費帳號後產生的帳號金鑰。\n"
 "\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:105
+#: /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。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
 msgid "The author whose book to search for."
 msgstr "要搜尋的書籍作者。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
 msgid "The title of the book to search for."
 msgstr "要搜尋的書名。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
 msgid "The publisher of the book to search for."
 msgstr "要搜尋的出版者。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid "LibraryThing.com timed out. Try again later."
 msgstr "LibraryThing.com 已逾時。請稍後再試。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:60
+#: /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/trunk/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
 msgid " not found."
 msgstr " 無法找到。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid "LibraryThing.com server error. Try again later."
 msgstr "LibraryThing.com 伺服器錯誤。請稍後再試。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
@@ -2019,166 +2062,162 @@ msgstr ""
 "\n"
 "從 LibraryThing.com 以 ISBN 辨識書籍並取封面\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1112
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1220
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1371
 msgid "Cover"
 msgstr "封面"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr "修改圖片以符合 Palm 裝置的大小限制。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr "當出現時，使用作者排序欄位當成作者。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
 msgstr "停用對檔案內容的壓縮。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40
+#: /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/trunk/src/calibre/ebooks/mobi/output.py:108
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
 msgstr "所有文章"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:258
+#: /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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1374
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194
+#: /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/trunk/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
 msgid "Index"
 msgstr "索引"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
 msgid "Glossary"
 msgstr "辭彙"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Acknowledgements"
 msgstr "致謝"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Bibliography"
 msgstr "參考書目"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Colophon"
 msgstr "版權頁"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Copyright"
 msgstr "版權所有"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Dedication"
 msgstr "呈獻"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Epigraph"
 msgstr "題辭"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Foreword"
 msgstr "序"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
 msgid "Notes"
 msgstr "備註"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
 msgid "Preface"
 msgstr "序"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/ebooks/oeb/iterator.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "%s 格式的電子書尚未支援"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
 msgstr "HTML 目錄頁產生選項。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
 msgstr "書籍護套"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34
+#: /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 "找不到合理的分割點：%s Sub-tree 大小：%d KB"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr "未命名的"
-
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
 msgstr "OPF/NCX/etc. 產生選項。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
 msgstr "要產生的 OPF 版本。預設值為 %default。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
 msgid ""
 "Generate an Adobe \"page-map\" file if pagination information is available."
 msgstr "如果分頁資訊可用，產生 Adobe \"page-map\" 檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
 msgstr "註腳"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
 msgstr "側邊欄"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:22
+#: /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 "一般而言 calibre 會把空行視為段落標記。使用這個選項則會把每一行視為一個段落。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:26
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:26
+#: /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+ "
@@ -2188,32 +2227,32 @@ msgstr ""
 "一般而言 calibre 會把空行視為段落標記。使用這個選項則會把每一個以縮排開頭的行（tab 鍵或 2 "
 "個以上的空白）視為一個段落。段落會一直持續到下一個以縮排開頭的行為止。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
 msgstr "在 pdb 容器內部使用的格式。選擇有："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:27
+#: /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 "指定輸出文件的字元編碼。預設值為 cp1252。注意：這個選項並非所有格式都適用。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
 msgstr "不要從文件中解出圖片"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26
+#: /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 "用來決定是否要折行的長度比例。可用的數值是從 0 到 1 的數字。預設值為 0.5，這是一半的長度。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:30
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
 msgstr "使用新的 PDF 轉換引擎。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
 "command ...\n"
 "\n"
@@ -2233,7 +2272,7 @@ msgstr ""
 "\n"
 "處理 PDF。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2243,34 +2282,34 @@ msgstr ""
 "\n"
 "修剪 PDF 檔案。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41
+#: /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/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41
+#: /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 "從最左邊 x 要修剪的像素數（預設值為 %s）"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44
+#: /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 "從最左邊 y 要修剪的像素數（預設值為 %s）"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47
+#: /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 "從最右邊 x 要修剪的像素數（預設值為 %s）"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50
+#: /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 "從最右邊 y 要修剪的像素數（預設值為 %s）"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53
+#: /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`"
@@ -2278,21 +2317,21 @@ msgstr ""
 "以 ghostscript 產生的檔案，允許每個頁面分別修剪 `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox "
 "file.pdf 2> bounding`"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
 msgstr "修剪選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /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 "用來控制 pdf 轉換的選項"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
 msgid ""
 "[options] file.pdf password\n"
 "\n"
@@ -2302,11 +2341,11 @@ msgstr ""
 "\n"
 "將 PDF 解密。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
 msgstr "解密選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
 msgid ""
 "[options] file.pdf password\n"
 "\n"
@@ -2316,11 +2355,11 @@ msgstr ""
 "\n"
 "將 PDF 加密。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
 msgstr "加密選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21
 msgid ""
 "file.pdf ...\n"
 "\n"
@@ -2330,31 +2369,31 @@ msgstr ""
 "\n"
 "取得關於這個 PDF 的資訊。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
 msgid "Author"
 msgstr "作者"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
 msgstr "主旨"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
 msgstr "建立者"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
 msgstr "頁"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
 msgstr "檔案大小"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
 msgstr "PDF 版本"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
 "[options] file1.pdf file2.pdf ...\n"
 "\n"
@@ -2368,11 +2407,11 @@ msgstr ""
 "\n"
 "合併多個 PDF 檔。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
 msgstr "合併選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
 msgid ""
 "[options] file.pdf\n"
 "\n"
@@ -2382,11 +2421,11 @@ msgstr ""
 "\n"
 "將 PDF 反轉。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
 msgstr "反轉選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
 msgid ""
 "file.pdf degrees\n"
 "\n"
@@ -2396,11 +2435,11 @@ msgstr ""
 "\n"
 "將 PDF 的頁面順時針旋轉。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
 msgstr "旋轉選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
 "\n"
 "%prog %%name [options] file.pdf page_to_split_on ...\n"
@@ -2426,48 +2465,48 @@ msgstr ""
 "\n"
 "將 PDF 分割。\n"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
 msgstr "分割選項："
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31
+#: /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 "測量的單位。預設為英吋。選擇有 %s 注意：這不會影響邊界的單位！"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36
+#: /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 "紙張的大小。這個大小在使用了輸出設定檔時會被蓋過。預設值為 letter。選擇有 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:40
+#: /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 "自訂文件的大小。使用的格式為 寬度x高度 EG。`123x321` 為指定寬度和高度。這會覆蓋任何指定的紙張大小。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr "頁面的方向。預設值為直向。選擇有 %s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:49
+#: /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/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr "找不到 pdftohtml，請檢查您的 PATH 是否有它"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:33
+#: /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 "指定輸出文件的字元編碼。預設值為 cp1252。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:199
+#: /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"
@@ -2476,29 +2515,35 @@ msgstr ""
 "這個 RTF 檔案含有 calibre 不支援的功能。請先將它轉換為 HTML 後再試一次。\n"
 "%s"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:23
+#: /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 "指定輸出文件的字元編碼。預設值為 utf-8。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:27
+#: /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 "指定要使用的壓縮等級。比例為 1 到 10。1 是最少的壓縮但速度最快，而 10 為最高的壓縮但速度最慢。"
 
-#: /home/kovid/work/trunk/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 "透過 markdown 前處理器執行文字輸入。要了解更多關於 markdown 的資訊請看"
 
-#: /home/kovid/work/trunk/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 "不要在輸出的文字中插入目錄頁。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24
+#: /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'. "
@@ -2507,13 +2552,13 @@ msgstr ""
 "要使用的換行(newline)字元類型。選項有 %s。預設值為「system」(系統)。使用「old_mac」(舊式 Mac) 可以相容於 Mac OS "
 "9 及更早的版本。Mac OS X 請使用「unix」。「system」預設會使用這個電腦的 OS 所使用的換行字元。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:30
+#: /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 "指定輸出文件的字元編碼。預設值為 utf-8。注意：這個選項並不一定能用於所有的格式。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:38
+#: /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 "
@@ -2523,296 +2568,443 @@ msgstr ""
 "每一行的最大字元數。這會在指定數值前的第一個空白處斷行。如果在行中沒有空白，則會使用超過指定數值後的空白處斷行。同時，這個數值最小為 25 個字元。使用 "
 "0 表示停用斷行。"
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45
+#: /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 "當沒有空白時強制於 max-line-length 值處分割。同時允許 max-line-length 成為下列的最小值"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Confirm before deleting"
 msgstr "刪除前確認"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
 msgstr "工具列圖示尺寸"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/__init__.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr "主視窗位置大小"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Sort tags list by popularity"
 msgstr "依熱門度排序標籤清單"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:47
+#: /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/trunk/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Defaults for conversion to LRF"
 msgstr "轉換為 LRF 的預設值"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Options for the LRF ebook viewer"
 msgstr "LRF 電子書檢視器的選項"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "在個別視窗中顯示 cover flow 而非在主 calibre 視窗中顯示"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Maximum number of waiting worker processes"
 msgstr "等待 worker 程序的最大數目"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:482
+#: /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:138
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr "已複製"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy"
 msgstr "複製"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172
 msgid "Copy to Clipboard"
 msgstr "複製到剪貼簿"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:382
 msgid "Choose Files"
 msgstr "選擇檔案"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
 msgstr "搜尋"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229
 msgid "Adding..."
 msgstr "加入..."
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:255
 msgid "Path error"
 msgstr "路徑錯誤"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:256
-#: /home/kovid/work/trunk/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:599
 msgid "No books"
 msgstr "沒有書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:257
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1822
+#: /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 "找不到書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327
 msgid "Added"
 msgstr "已加入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:340
 msgid "Adding failed"
 msgstr "加入失敗"
 
-#: /home/kovid/work/trunk/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 "加入書籍的程序似乎停住了。請試著重新啟動 calibre 並以較少資料量的方式加入書籍，直到您找到出問題的那本書。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Duplicates found!"
 msgstr "發現重複項目！"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid "Adding duplicates..."
 msgstr "正在加入複本..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:423
 msgid "Saving..."
 msgstr "儲存中..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:476
 msgid "Saved"
 msgstr "已儲存"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+#: /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: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/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/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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+#: /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/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/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
 msgstr "CSV/XML 選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107
+#: /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:74
+#: /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/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr "在輸出中包含的欄位："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr "電子書選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:282
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:958
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:976
+#: /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
 msgid "Catalog"
 msgstr "分類"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
 msgstr "額外的註記標籤前綴："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
+#: /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/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
+#: /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], "
@@ -2821,135 +3013,135 @@ msgid ""
 "Genre Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
 msgstr "將數字當成文字排序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
 msgstr "catalog.ui 的分頁範本"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36
+#: /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/trunk/src/calibre/gui2/convert/bulk.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
 msgstr "大量轉換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185
+#: /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/trunk/src/calibre/gui2/convert/comic_input.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
 msgstr "漫畫輸入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13
+#: /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/trunk/src/calibre/gui2/convert/comic_input_ui.py:89
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:94
+#: /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 "顏色數(&N):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96
+#: /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 "停用標準化(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97
+#: /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 "保持長寬比例(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98
+#: /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 "停用銳化(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:93
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104
+#: /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 "停用截短(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103
+#: /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 "寬模式(&W)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:95
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99
+#: /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 "橫向(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:96
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101
+#: /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 "由右至左(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:97
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100
+#: /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 "不要排序(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:98
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102
+#: /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 "去除斑點(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
 msgstr "停用漫畫處理(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:111
+#: /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 "輸出格式(&O):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101
+#: /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/trunk/src/calibre/gui2/convert/debug.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
 msgstr "除錯"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
 msgstr "對轉換程序除錯。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:51
+#: /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/trunk/src/calibre/gui2/convert/debug.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
 msgstr "無效的除錯資料夾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
 msgstr "無法建立除錯資料夾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:50
+#: /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 "
@@ -2959,105 +3151,65 @@ msgstr ""
 "選擇要放置除錯輸出的資料夾。如果您有指定資料夾，calibre "
 "會放置許多除錯用的輸出資料在裡面。這樣可以幫助我們了解轉換的過程並想出轉換參數的正確數值，像是目錄頁和章節的的偵測。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr "..."
-
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54
+#: /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 "除錯程序會輸出在轉換過程中各個階段產生的中間 HTML 檔。這個 HTML 有時也可以當成要手動編輯轉換工作時很好的起點。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
 msgstr "EPUB 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
 msgstr "不要在分頁處分割(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
 msgstr "沒有預設封面(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
 msgstr "分割大於此項的檔案(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
 msgstr " KB"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
 msgstr "FB2 輸入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29
+#: /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 "不要在書籍的開頭插入目錄頁(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
 msgstr "FB2 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47
+#: /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 "行內目錄頁(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
 msgstr "字型縮放精靈"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:100
+#: /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 "
@@ -3078,505 +3230,505 @@ msgstr ""
 "<p>請查閱 <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-"
 "size-rescaling\">User Manual</a> 以了解字型大小縮放如何運作。</p>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
 msgstr "輸出文件(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109
+#: /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 "基礎字型大小(&B):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:105
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123
+#: /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 "字型大小設定鍵(&K):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:106
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127
+#: /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 " pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
 msgstr "使用預設數值(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
 msgstr "輸入文件(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
 msgstr "字型大小(&F): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
 msgstr " 會映射到大小： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
 msgstr "0.0 pt"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr "外觀 & 感覺"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
 msgstr "停用字型大小縮放(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
 msgstr "基礎字型大小(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124
+#: /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/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
 msgstr "行高(&H):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
 msgstr "輸入字元編碼(&E):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
 msgstr "移除段落間距(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
 msgstr "縮排大小："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131
+#: /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 "<p>當 calibre 移除內部的段落間距時，會自動設定段落縮排，以確保每個段落能清楚的辨識。這個選項控制了縮排的寬度。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
 msgstr " em"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
 msgstr "表格直線化(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
 msgstr "額外的 &CSS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
 msgstr "插入空白行(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
 msgstr "LRF 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
 msgstr "啟用寬圖片自動旋轉(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
 msgstr "字距(&W)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
 msgstr "最小段落縮排(&I):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
 msgstr "將表格繪製為圖片(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122
+#: /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/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
 msgstr "加入頁首(&H)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
 msgstr "頁首分隔(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
 msgstr "頁首格式(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
 msgstr "內嵌的字型(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
 msgstr "襯線字型族系(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
 msgstr "無襯線字型族系(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:43
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:99
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:168
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:106
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:107
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:184
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:115
+#: /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/trunk/src/calibre/gui2/convert/metadata.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116
+#: /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>讀取檔案時發生錯誤： <br /><b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:185
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:124
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
 msgid "Use cover from &source file"
 msgstr "使用來源檔案的封面(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /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 "改變封面圖片(&C):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /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 "書名(&T): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /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 "作者(&A): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr "作者排序(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /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 "出版者(&P): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /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 "標籤(&G): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /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 "用來分類書籍的標籤。這在搜尋時特別有用。<br><br>這可以是任何字或語詞，以逗號分隔。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /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 "叢書(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /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/trunk/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /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/trunk/src/calibre/gui2/convert/mobi_output.py:20
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
 msgstr "MOBI 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
 msgstr "預設值"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
 msgstr "目錄頁的標題(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
 msgstr "為 &Palm 裝置重新縮放圖片"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
 msgstr "以作者進行排序(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
 msgstr "停用檔案內容的壓縮"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71
+#: /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/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
 msgstr "Kindle 選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
 msgstr "頁面設定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
 msgstr "輸出設定檔(&O):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
 msgstr "設定檔描述"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
 msgstr "輸入設定檔(&I):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
 msgstr "邊界"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
 msgstr "左(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
 msgstr "上(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
 msgstr "右(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
 msgstr "下(&B):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
 msgstr "PDB 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /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 "將每一行視為段落(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /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/trunk/src/calibre/gui2/convert/pdb_output.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
 msgstr "PDB 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
 msgstr "格式(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
 msgstr "PDF 輸入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
 msgstr "不使用圖片(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
 msgstr "PDF 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
 msgstr "紙張大小(&P):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
 msgstr "紙張方向(&O):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
 msgid "Preserve &aspect ratio of cover"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
 msgstr "RB 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2067
+#: /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 "選擇要檢視的格式"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
 msgstr "開啟書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
 msgstr "Regex Builder"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
 msgstr "預覽"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
 msgstr "Regex:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:117
+#: /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/trunk/src/calibre/gui2/convert/single.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
 msgstr "轉換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
 msgstr "用來指定輸入格式的選項。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:108
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:64
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /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/trunk/src/calibre/gui2/convert/single_ui.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
 msgstr "輸入格式(&I):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
 msgstr "每本書分別使用已儲存的轉換設定值(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
@@ -3584,122 +3736,122 @@ msgstr ""
 "結構\n"
 "偵測"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19
+#: /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/trunk/src/calibre/gui2/convert/structure_detection.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
 msgstr "偵測章節於 (XPath 表示式):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
 msgstr "在此之前插入分頁符號 (XPath 表示式):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
 msgstr "頁首正規表示式："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
 msgstr "頁尾正規表示式："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
 msgid "Invalid regular expression"
 msgstr "不正確的正規表示式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
 msgid "Invalid regular expression: %s"
 msgstr "不正確的正規表示式：%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:62
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:38
+#: /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 "無效的 XPath"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39
+#: /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 表示式 %s 是無效的。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
 msgstr "章節標記(&M):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
 msgstr "移除首張圖片(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Insert &metadata as page at start of book"
 msgstr "在書籍開頭插入元數據當作一頁(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
 msgid "&Preprocess input file to possibly improve structure detection"
 msgstr "前置處理輸入檔案儘可能增進結構的偵測(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
 msgstr "移除頁尾(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
 msgstr "移除頁首(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr "目錄頁"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18
+#: /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/trunk/src/calibre/gui2/convert/toc.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
 msgstr "第 &1 級目錄頁 (XPath 表示式):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
 msgstr "第 &2 級目錄頁 (XPath 表示式):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
 msgstr "第 &3 級目錄頁 (XPath 表示式):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "不要將偵測到的章節加入目錄頁(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "加入目錄頁的連結數(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "章節界限(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "強制使用自動產生的目錄頁(&F)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "目錄頁過濾條件(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
 msgstr "TXT 輸入"
 
-#: /home/kovid/work/trunk/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 "使用 markdown 處理"
 
-#: /home/kovid/work/trunk/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 "
@@ -3708,106 +3860,110 @@ msgstr ""
 "<p>Markdown 是一種用於純文字檔案的簡易標記語言，可以做進階的格式設計。要了解更多資訊，請參閱 <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>。"
 
-#: /home/kovid/work/trunk/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 "在使用 markdown 時不要將目錄頁插入輸出文字裡"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:16
+#: /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 "TXT 輸出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
 msgstr "行結尾樣式(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
 msgstr "每行最大長度(&M):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
 msgstr "強制設定每行最大長度"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:65
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:66
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /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/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
 msgid "Use a wizard to help construct the XPath expression"
 msgstr "使用精靈協助建構 XPath 表示式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
 msgstr "以標籤名稱比對 H&TML 標籤："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
 msgstr "*"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
 msgstr "a"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
 msgstr "br"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
 msgstr "div"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
 msgstr "h1"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
 msgstr "h2"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
 msgstr "h3"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
 msgstr "h4"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
 msgstr "h5"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
 msgstr "h6"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
 msgstr "hr"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
 msgstr "span"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
 msgstr "具有屬性(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
 msgstr "數值為(&V):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
 msgstr "(正規表示式)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84
+#: /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 "
@@ -3821,322 +3977,383 @@ msgstr ""
 "則會比對任何標籤。</p><p>要學習更多關於 XPath 的進階用法，請查閱 <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">XPath Tutorial</a>。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:38
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:135
+#: /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/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:110
+msgid "star(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:111
+msgid "Unrated"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:352
+msgid "Remove all tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:373
+msgid "tags to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:378
+msgid "tags to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "沒有可用的詳細資料。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:138
 msgid "Device no longer connected."
 msgstr "裝置已無連線。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
 msgid "Get device information"
 msgstr "取得裝置資訊"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:269
 msgid "Get list of books on device"
 msgstr "取得裝置上的書籍清單"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:288
 msgid "Send metadata to device"
 msgstr "傳送元數據到裝置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:297
 msgid "Upload %d books to device"
 msgstr "上傳 %d 本書到裝置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
 msgid "Delete books from device"
 msgstr "從裝置刪除書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
 msgid "Download books from device"
 msgstr "從裝置下載書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
 msgid "View book on device"
 msgstr "檢視裝置上的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr "並從書庫中刪除"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:373
 msgid "Set default send to device action"
 msgstr "設定預設的傳送到裝置動作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:324
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:331
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:333
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:335
+#: /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
 msgid "Email to"
 msgstr "寄電子郵件到"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:346
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:401
 msgid "Send to main memory"
 msgstr "傳送到主記憶體"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:348
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:403
 msgid "Send to storage card A"
 msgstr "傳送到記憶卡 A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:350
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
 msgid "Send to storage card B"
 msgstr "傳送到記憶卡 B"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-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/trunk/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:412
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+msgid "Storage Card A"
+msgstr ""
 
-#: /home/kovid/work/trunk/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:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+msgid "Storage Card B"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+msgid "Send and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
+msgid "Connect to folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "Disconnect from folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490
 msgid "Fetch annotations (experimental)"
 msgstr "取回註記（實驗性功能）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:600
 msgid "selected to send"
 msgstr "選擇要傳送的項目"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
 msgid "Choose format to send to device"
 msgstr "選擇要傳送到裝置的格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:613
 msgid "No device"
 msgstr "沒有裝置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
 msgid "Cannot send: No device is connected"
 msgstr "不能傳送：沒有連線中的裝置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
 msgid "No card"
 msgstr "沒有記憶卡"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:535
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
 msgid "Cannot send: Device has no storage card"
 msgstr "不能傳送：裝置沒有記憶卡"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
 msgid "E-book:"
 msgstr "電子書："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:667
 msgid "Attached, you will find the e-book"
 msgstr "已附加，您會發現電子書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:585
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
 msgid "in the %s format."
 msgstr "%s 格式。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:682
 msgid "Sending email to"
 msgstr "傳送電子郵件到"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:636
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:728
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:788
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:904
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:911
+#: /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
 msgid "No suitable formats"
 msgstr "沒有合適的格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:713
 msgid "Auto convert the following books before sending via email?"
 msgstr "是否在透過電子郵件傳送前自動轉換下列書籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "無法透過電子郵件傳送前下列書籍，因為找不到適合的格式："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:738
 msgid "Failed to email books"
 msgstr "無法寄出書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
 msgid "Failed to email the following books:"
 msgstr "無法寄出下列書籍："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743
 msgid "Sent by email:"
 msgstr "以電子郵件傳送："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:770
 msgid "News:"
 msgstr "新聞："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:771
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:782
 msgid "Sent news to"
 msgstr "傳送新聞到"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:729
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:789
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:905
+#: /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
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "是否在上傳到裝置前自動轉換下列書籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "Sending catalogs to device."
 msgstr "正在傳送分類到裝置。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:902
 msgid "Sending news to device."
 msgstr "正在傳送新聞到裝置。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957
 msgid "Sending books to device."
 msgstr "正在傳送書籍到裝置。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:998
 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/trunk/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1046
 msgid "No space on device"
 msgstr "裝置上已無空間"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1047
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>不能上傳書籍到裝置，因為已無更多可用空間 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
 msgid "Select available formats and their order for this device"
 msgstr "選擇這個裝置可用的格式和它們的順序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 msgid "Use sub directories"
 msgstr "使用子目錄"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Save &template:"
 msgstr "儲存範本(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:373
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:93
+#: /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 "路徑"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:372
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:94
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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 "格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
 msgstr "封面符合檢視(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
 msgstr "上一本(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
 msgstr "下一本(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
 msgstr "我的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
 msgstr "產生 {0} 書籍的分類"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
 msgstr "分類格式(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72
+#: /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 "分類標題（現有的同名分類會被取代）(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
 msgstr "自動傳送分類到裝置(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
 msgstr "分類選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
 msgstr "選擇格式"
 
-#: /home/kovid/work/trunk/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 "設定轉換漫畫的預設值 (CBR/CBZ 檔案)"
 
-#: /home/kovid/work/trunk/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 "設定轉換 %s 的選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
 msgstr "書名(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
 msgstr "作者(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
 msgstr "設定檔(&P):"
 
-#: /home/kovid/work/trunk/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 "%(plugin_type)s %(plugins)s"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:183
 msgid ""
 "\n"
 "Customization: "
@@ -4144,23 +4361,23 @@ msgstr ""
 "\n"
 "自訂化： "
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid ""
 "Email\n"
 "Delivery"
@@ -4168,11 +4385,11 @@ msgstr ""
 "電子郵件\n"
 "遞送"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Content\n"
 "Server"
@@ -4180,164 +4397,191 @@ msgstr ""
 "內容\n"
 "伺服器"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "如果核取這個選項，已下載的新聞就會自動寄到這個<br>電子郵件位址（以列出的格式之一）。"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:489
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 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/trunk/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /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 "錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:510
 msgid "Failed to install command line tools."
 msgstr "安裝命令列工具失敗。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:513
 msgid "Command line tools installed"
 msgstr "命令列工具已安裝"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:514
 msgid "Command line tools installed in"
 msgstr "命令列工具已安裝於"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr "如果您移動 calibre.app，您必須重新安裝命令列工具。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
 msgid "No valid plugin path"
 msgstr "沒有有效的外掛程式路徑"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:567
 msgid "%s is not a valid plugin path"
 msgstr "%s 不是有效的外掛程式路徑"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:570
 msgid "Choose plugin"
 msgstr "選擇外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
 msgid "Plugin cannot be disabled"
 msgstr "外掛程式不能停用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
 msgid "The plugin: %s cannot be disabled"
 msgstr "外掛程式：%s 不能停用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:592
 msgid "Plugin not customizable"
 msgstr "外掛程式不可自訂"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:593
 msgid "Plugin: %s does not need customization"
 msgstr "外掛程式：%s 不需要自訂"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:601
 msgid "Customize"
 msgstr "自訂"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:639
 msgid "Cannot remove builtin plugin"
 msgstr "不能移除內建的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:640
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " 不能移除。它是內建的外掛程式。請嘗試停用它來代替。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+msgid "The selected column is not a custom column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
+#: /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:678
+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:745
 msgid "Error log:"
 msgstr "錯誤紀錄檔："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:663
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:752
 msgid "Access log:"
 msgstr "存取紀錄檔："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:767
 msgid "Failed to start content server"
 msgstr "啟動內容伺服器失敗"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:804
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "選擇書籍的位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr "不正確的大小"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "尺寸 %s 是無效的。格式必須為 寬度x高度"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:783
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "Invalid database location"
 msgstr "無效的資料庫位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:866
 msgid "Invalid database location "
 msgstr "無效的資料庫位置 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 msgid "<br>Must be a directory."
 msgstr "<br>必須是目錄。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:871
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "無效的資料庫位置。<br>不能寫入 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:876
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:877
+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:911
 msgid "Checking database integrity"
 msgstr "正在檢查資料庫完整性"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:931
 msgid "Failed to check database integrity"
 msgstr "檢查資料庫完整性失敗"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:936
 msgid "Some inconsistencies found"
 msgstr "發現某些不一致"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:937
 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 "
@@ -4346,32 +4590,32 @@ msgid ""
 msgstr ""
 "下列書籍具有在資料庫中列出但實際無法使用的格式。這個格式的項目已經移除了。您應該自行檢查它們。這通常發生在您直接操作書庫資料夾中的檔案時。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /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 "您可以在這裡控制 calibre 如何從加入的檔案中讀取元數據。calibre 可以從檔案的內容或檔案名稱中讀取資料。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:105
 msgid "Read metadata only from &file name"
 msgstr "只從檔案名稱讀取元數據(&F)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
 msgid "&Swap author firstname and lastname"
 msgstr "交換作者的姓氏及名字順序(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /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"
@@ -4382,63 +4626,63 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /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/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
 msgid "&Configure metadata from file name"
 msgstr "從檔案名稱設定元數據(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
 msgid "&Adding books"
 msgstr "加入書籍(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /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 "您可以在這裡控制當按下「儲存到磁碟」按鈕時 calibre 要如何儲存您的書籍："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
 msgid "Save &cover separately"
 msgstr "將封面分開儲存(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
 msgid "Update &metadata in saved copies"
 msgstr "更新已儲存複本中的元數據(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
 msgid "Save metadata in &OPF file"
 msgstr "以 &OPF 檔案儲存元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:119
 msgid "Convert non-English characters to &English equivalents"
 msgstr "將非英語字元轉換為英語同義字(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
 msgid "Format &dates as:"
 msgstr "將日期格式設為(&D):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
 msgid "File &formats to save:"
 msgstr "要儲存的檔案格式(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
 msgid "Replace space with &underscores"
 msgstr "空白字元換成底線(&U)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
 msgid "Change paths to &lowercase"
 msgstr "路徑改變為小寫(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
 msgid "&Saving books"
 msgstr "儲存書籍(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /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 "
@@ -4447,192 +4691,208 @@ msgstr ""
 "您可以在這裡控制當您按下「傳送到裝置」按鈕時 calibre 要如何儲存您的書籍。這個設定值可以被個別裝置覆蓋，只要使用 偏好設定-"
 ">外掛程式「自訂裝置介面」外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
 msgid "Sending to &device"
 msgstr "傳送到裝置(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:409
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201
+#: /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/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
 msgid "Browse for the new database location"
 msgstr "瀏覽新的資料庫位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Show notification when &new version is available"
 msgstr "當有新版本可用時顯示通知(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "預設下載社交網路元數據 (標籤/評等/其他)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "當取得元數據時覆蓋作者和書名(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Default network &timeout:"
 msgstr "預設網路逾時時間(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr "設定網路抓取的預設逾時時間（例如任何我們透過網路取得資訊的時間）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid " seconds"
 msgstr " 秒"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Choose &language (requires restart):"
 msgstr "選擇語言（需重新啟動）(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "Normal"
 msgstr "一般"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "High"
 msgstr "高"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Low"
 msgstr "低"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
 msgid "Job &priority:"
 msgstr "工作優先權(&P):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Preferred &output format:"
 msgstr "偏好的輸出格式(&O):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
 msgid "Preferred &input format order:"
 msgstr "偏好的輸入格式(&I):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Use &Roman numerals for series number"
 msgstr "在叢書編號使用羅馬數字(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
 msgid "Enable system &tray icon (needs restart)"
 msgstr "啟用系統匣圖示（需要重新啟動）(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
 msgid "Show &notifications in system tray"
 msgstr "在系統匣中顯示通知(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+msgid "Show &splash screen at startup"
+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 "在個別視窗中顯示封面瀏覽器（需要重新啟動）(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Search as you type"
 msgstr "隨打即查"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "自動將下載的新聞傳送到電子書閱讀器(&N)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "當新聞自動傳送到閱讀器後將它自書庫刪除(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "在瀏覽模式中要顯示的封面數（需重新啟動）(&N):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "Toolbar"
 msgstr "工具列"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Button size in toolbar"
 msgstr "工具列按鈕大小(&B)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "Show &text in toolbar buttons"
 msgstr "在工具列按鈕中顯示文字(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Select visible &columns in library view"
 msgstr "選擇在書庫檢視中顯示的欄位(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Remove a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+msgid "Add a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "使用內部檢視器於(&V):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Add an email address to which to send books"
 msgstr "加入要傳送電子書的電子郵件位址"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 msgid "&Add email"
 msgstr "加入電子郵件(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Make &default"
 msgstr "成為預設值(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "&Remove email"
 msgstr "移除電子郵件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "等待 worker 程序的最大數目（需重新啟動）(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Check database integrity"
 msgstr "檢查資料庫完整性(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "&Install command line tools"
 msgstr "安裝命令列工具(&I)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Open calibre &configuration directory"
 msgstr "開啟 &calibre 組態目錄"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "限制最大同時工作不超過可用的 &CPU 核心"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "Debug &device detection"
 msgstr "裝置偵測除錯(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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 "
@@ -4640,72 +4900,72 @@ msgid ""
 msgstr ""
 "calibre 包含了一個網路伺服器，讓您可以在世界的任何地方使用瀏覽器存取您的書籍收藏。任何對這個設定值的改變都要在伺服器重新啟動後才會生效。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Server &port:"
 msgstr "伺服器連接埠(&P):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:555
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr "如果您讓密碼留空，任何人都可以使用網頁介面存取您的藏書。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr "顯示封面的最大尺寸 (寬度x高度)。太大的封面會被調整大小。 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Max. &cover size:"
 msgstr "最大封面尺寸(&C):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:559
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:60
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /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/trunk/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
 msgid "Max. &OPDS items per query:"
 msgstr "每次查詢最大 &OPDS 項目："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "&Start Server"
 msgstr "啟動伺服器(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 msgid "St&op Server"
 msgstr "停止伺服器(&O)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "&Test Server"
 msgstr "測試伺服器(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 msgid "Run server &automatically on startup"
 msgstr "啟動時自動執行伺服器(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "View &server logs"
 msgstr "檢視伺服器紀錄檔(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:566
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /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"
@@ -4718,121 +4978,234 @@ msgstr ""
 "<p>Stanza 應該能自動看到您的 calibre 藏書。如果沒有，請試著在您 iPhone 上的 Stanza 閱讀器把 URL "
 "http://myhostname:8080 加入為新的分類。其中 myhostname 應該是執行 calibre 的電腦的有效主機名稱或 IP 位址。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr "您可以在這裡自訂 Caligre 的行為，控制它使用何種外掛程式。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "Enable/&Disable plugin"
 msgstr "啟用/停用外掛程式(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "&Customize plugin"
 msgstr "自訂外掛程式(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "&Remove plugin"
 msgstr "移除外掛程式(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Add new plugin"
 msgstr "加入新的外掛程式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Plugin &file:"
 msgstr "外掛程式檔案(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "&Add"
 msgstr "加入(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:177
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1162
+#: /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
 msgid "Date"
 msgstr "日期"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
+#: /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/trunk/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
+#: /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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:18
+msgid "Text, column shown in the tag browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:21
+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
+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
+msgid "Floating point numbers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+msgid "Integers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Ratings, shown with stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:36
+msgid "Yes/No"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:60
+msgid "No column selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:61
+msgid "No column has been selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "Selected column is not a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:96
+msgid "No lookup name was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:98
+msgid ""
+"The label must contain only letters and digits, and start with a letter"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:107
+msgid "No column heading was provided"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:113
+msgid "The lookup name %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:123
+msgid "The heading %s is already used"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:125
+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/trunk/src/calibre/gui2/dialogs/config/device_debug.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
 msgstr "複製到剪貼簿(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/device_debug.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
 msgstr "裝置偵測除錯"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
 msgstr "無效的範本"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
 msgstr "範本 %s 是無效的："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
 msgstr "儲存範本(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:43
+#: /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 "
@@ -4843,68 +5216,64 @@ msgstr ""
 "藉由調整下列範本，您可以控制檔案要存在哪個資料夾及檔案名稱為何。您可以使用 / "
 "字元代表子資料夾。可用的元數據變數如下所述。如果有特定的書籍沒有某些元數據，那個變數就會以空字串代替。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/save_template_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
 msgstr "可用的變數："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/social.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
 msgstr "正在下載社交網路元數據，請稍候..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr "您確定嗎？"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
 msgstr "再次顯示這個警告(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
 msgstr "錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 msgid "Author Sort"
 msgstr "作者排序"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
 msgid "Finding metadata..."
 msgstr "正在尋找元數據..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
 msgid "Could not find metadata"
 msgstr "找不到元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
 msgid "Warning"
 msgstr "警告"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
 msgid "Could not fetch metadata from:"
 msgstr "無法取得元數據於："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
 msgid "No metadata found"
 msgstr "找不到元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /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 "找不到元數據，請試著調整書名和作者或 ISBN 碼。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
 msgstr "取得元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:86
+#: /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 "
@@ -4914,128 +5283,123 @@ msgstr ""
 "<p>calibre 可以從兩個地方找到您的書籍：<b>Google Books</b> 和 <b>isbndb.com</b>。<p>要使用 "
 "isbndb.com 您必須先註冊一個<a href=\"http://www.isbndb.com\">免費帳號</a>並在下面輸入存取碼。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
 msgstr "存取碼(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
 msgstr "取回"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:89
 msgid "Matches"
 msgstr "符合項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90
+#: /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/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
+#: /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 "下載選取書籍的社交網路元數據 (標籤/評等/其他) (&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
+#: /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/trunk/src/calibre/gui2/dialogs/job_view_ui.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
 msgstr "工作的詳細資料"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
 msgstr "使用中的工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
 msgstr "停止選取的工作(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
 msgstr "顯示工作詳細資料(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
 msgstr "停止所有的工作(&A)"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
 msgid "Edit Meta information"
 msgstr "編輯元數據資訊"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "元數據資訊"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
 msgstr "自動設定作者排序(&U)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
 msgid "Author s&ort: "
 msgstr "作者排序(&O): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/trunk/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 "指定這本書籍的作者要如何排序。例如 Charles Dickens 要排成 Dickens, Charles。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/trunk/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 "評等(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/trunk/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 "這本書的評等。從 0-5 顆星"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
 msgstr "沒有改變"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
 msgstr "加入標籤(&G): "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
 msgstr "移除標籤(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
+#: /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/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr "移除格式(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
 msgstr "交換書名和作者(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /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"
@@ -5043,431 +5407,489 @@ msgid ""
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1284
+#: /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 "書籍"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:193
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "不能從 %s 格式讀取元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:254
-#: /home/kovid/work/trunk/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/trunk/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 "無法從 %s 格式讀取封面"
 
-#: /home/kovid/work/trunk/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 "%s 格式中的封面是無效的"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:447
 msgid "This ISBN number is valid"
 msgstr "這個 ISBN 編號是有效的"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:450
 msgid "This ISBN number is invalid"
 msgstr "這個 ISBN 編號是無效的"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:546
 msgid "Downloading cover..."
 msgstr "正在下載封面..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /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
 msgid "Cannot fetch cover"
 msgstr "不能取回封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:570
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>無法取回封面。</b><br/>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "The download timed out."
 msgstr "下載已逾時。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:564
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "找不到這本書的封面。請先試著指定 ISBN。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
 msgid "Bad cover"
 msgstr "錯誤的封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
 msgid "The cover is not a valid picture"
 msgstr "這個封面不是有效的圖片"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:610
 msgid "There were errors"
 msgstr "有某些錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
 msgid "There were errors downloading social metadata"
 msgstr "下載社交網路元數據時發生錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:640
 msgid "Cannot fetch metadata"
 msgstr "不能取回元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:641
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr "您必須至少指定 ISBN、書名、作者或出版者"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:712
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:713
 msgid "Could not open %s. Is it being used by another program?"
 msgstr "無法開啟 %s。它是否已被其他的程式開啟？"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "作者排序(&O): "
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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 "出版日(&D):"
 
-#: /home/kovid/work/trunk/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 "dd MMM yyyy"
 
-#: /home/kovid/work/trunk/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 "日期(&D):"
 
-#: /home/kovid/work/trunk/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 "評論(&C)"
 
-#: /home/kovid/work/trunk/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 "從伺服器取回元數據(&F)"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "下載封面(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 msgid "Password needed"
 msgstr "需要密碼"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:52
 msgid "Aborting..."
 msgstr "正在中止..."
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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 "%d 天，%d 小時 %d 分鐘前"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/gui2/dialogs/scheduler.py:217
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:192
+#: /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/trunk/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/trunk/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/trunk/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/trunk/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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:193
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
 msgstr "下載所有排程項目(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
 msgstr "宣傳"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
 msgstr "已排程下載(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
 msgstr "天"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200
 msgid "Monday"
 msgstr "星期一"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201
 msgid "Tuesday"
 msgstr "星期二"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Wednesday"
 msgstr "星期三"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Thursday"
 msgstr "星期四"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "Friday"
 msgstr "星期五"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205
 msgid "Saturday"
 msgstr "星期六"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206
 msgid "Sunday"
 msgstr "星期日"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
 msgstr "於"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
 msgstr "帳號(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr "要讓排程工作運作，您必須保持 calibre 在執行中。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
 msgstr "排程(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
 msgstr "將書名加為標籤(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
 msgstr "額外的標籤(&E):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
 msgstr "進階(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
 msgstr "立刻下載(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221
+#: /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/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
 msgstr "刪除新聞下載時刻早於 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
 msgstr "包含"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37
+#: /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/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38
+#: /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>反轉這次比對。亦即，只會傳回 <b>不</b> 符合這次查詢的結果。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
 msgstr "反相"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
 msgstr "尋找的項目含有..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
 msgstr "所有這些字詞(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
 msgstr "完全符合的語詞(&P):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
 msgstr "一或多個字詞(&O):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
 msgstr "但是不要顯示項目含有..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
 msgstr "任何這些不需要的字詞(&U):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
 msgstr "要使用何種比對："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:122
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:123
+#: /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/trunk/src/calibre/gui2/dialogs/search_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
 msgstr " "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125
+#: /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"
@@ -5475,185 +5897,313 @@ msgstr ""
 "請查閱 <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
 "interface\">User Manual</a> 以獲取更多協助"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/select_formats.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
 msgstr "選擇格式"
 
-#: /home/kovid/work/trunk/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:72
+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
+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/trunk/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?"
 msgstr "下列標籤被一或多個書籍使用。您確定要删除它們嗎？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
 msgstr "標籤編輯器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
 msgstr "可用的標籤(&V)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
 msgstr "將標籤套用到目前的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
 msgstr "套用的標籤(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
 msgstr "取消套用(移除)目前書籍的標籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
 msgstr "加入標籤(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+#: /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/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+#: /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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:429
+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:430
+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:71
+msgid "Category Editor"
+msgstr ""
+
+#: /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 ""
+"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
+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
+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/trunk/src/calibre/gui2/dialogs/test_email_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
 msgstr "從 %s 傳送測試郵件到："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:53
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:115
+#: /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 "測試(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127
 msgid "No recipe selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:156
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
 msgstr "餵送必須有標題"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
 msgstr "餵送必須要有標題"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
 msgstr "餵送必須有 URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
 msgstr "餵送 %s 必須有 URL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
 msgstr "已經存在"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:227
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:228
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:241
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:242
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
 msgstr "加入自訂新聞來源"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+#: /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"
@@ -5667,62 +6217,62 @@ msgid ""
 "process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
 msgstr "最舊的文章(&O):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
 msgstr "每次餵送最大文章數(&M):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
 msgstr "餵送標題(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
 msgstr "餵送 &URL:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
 msgstr "加入餵送(&A)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+#: /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/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:107
+#: /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"
@@ -5764,846 +6314,1005 @@ msgstr ""
 "weight:600;\">測試</span> "
 "功能可以在一些範例檔案名稱上測試您的正規表示式。各種元數據項目的群組名稱寫在工具提示中。</p></body></html>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
 msgstr "正規表示式(&E)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
 msgstr "檔案名稱(&N):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
 msgstr "書名："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "正規表示式 (?P&lt;title&gt;)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:82
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94
+#: /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:94
 msgid "No match"
 msgstr "沒有相符"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
 msgstr "作者："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
 msgstr "正規表示式 (?P<author>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
 msgstr "叢書："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
 msgstr "正規表示式 (?P<series>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
 msgstr "叢書索引："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
 msgstr "正規表示式 (?P<series_index>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
 msgstr "正規表示式 (?P<isbn>)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
 msgid "Job"
 msgstr "工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
 msgid "Status"
 msgstr "狀態"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
 msgid "Progress"
 msgstr "進度"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:57
 msgid "Running time"
 msgstr "執行時間"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:69
 msgid "There are %d running jobs:"
 msgstr "還有 %d 個執行中的工作："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:94
+#: /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
 msgid "Unknown job"
 msgstr "不明的工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d waiting jobs:"
 msgstr "還有 %d 個等候中的工作："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
 msgid "Cannot kill job"
 msgstr "不能中止工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:213
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "不能終止與裝置連線中的工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
 msgid "Job has already run"
 msgstr "工作已經在執行"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:244
 msgid "Unavailable"
 msgstr "無法使用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
 msgid " - Jobs"
 msgstr " - 工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:176
-#: /home/kovid/work/trunk/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:47
+msgid "On Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:49
 msgid "Size (MB)"
 msgstr "大小 (MB)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:52
 msgid "Rating"
 msgstr "評等"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:365
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:371
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:376
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:440
+#: /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 "沒有"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1010
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "書籍 <font face=\"serif\">%s</font> / %s。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:899
+#: /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
+msgid "The lookup/search name is \"{0}\""
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:831
+msgid "Size"
+msgstr ""
+
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:990
+msgid "Format"
+msgstr "格式"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1050
+msgid "Marked for deletion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1053
+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
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:106
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Descending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Change text alignment for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124
+msgid "Right"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:125
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:144
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:479
 msgid "Not allowed"
 msgstr "不允許的"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:480
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr "尚未支援拖放到裝置上。首先請將書籍加入 calibre 書庫。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
-msgid "Format"
-msgstr "格式"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr "請雙擊以<b>編輯</b>我<br><br>"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr "設定檢視器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
 msgstr "使用白色背景"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
 msgstr "連字符"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:50
+#: /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>變更會在重新啟動後生效。</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
 msgstr " - LRF 檢視器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
+#: /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 "找不到搜尋語詞 <i>%s</i>的<b>任何符合項</b>。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:440
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
 msgstr "LRF 檢視器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
 msgstr "正在分析 LRF 檔案"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
 msgstr "LRF 檢視器工具列"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:476
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:188
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
 msgstr "下一個符合項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196
+#: /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/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
 msgstr "設定"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/gui2/main.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:67
 msgid "Choose a location for your calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:76
 msgid "Failed to create library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:77
 msgid "Failed to create calibre library at: %r. Aborting."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:145
+#: /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/trunk/src/calibre/gui2/main.py:146
+#: /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/trunk/src/calibre/gui2/main.py:150
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:601
+#: /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 書庫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:175
 msgid "Choose a location for your new calibre e-book library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:173
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
 msgid "Bad database location"
 msgstr "錯誤的資料庫位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:186
 msgid "Bad database location %r. calibre will now quit."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
 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/trunk/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:219
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Starting %s: Loading books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:275
 msgid "If you are sure it is not running"
 msgstr "如果您不確定它是否在執行中"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 msgid "Cannot Start "
 msgstr "不能啟動 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "%s is already running."
 msgstr "%s 已經在執行中。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
 msgid "may be running in the system tray, in the"
 msgstr "可能在系統匣中執行，在"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "upper right region of the screen."
 msgstr "畫面的右上角區域。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "lower right region of the screen."
 msgstr "畫面的右下角區域。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
 msgid "try rebooting your computer."
 msgstr "嘗試重新啟動您的電腦。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:265
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302
 msgid "try deleting the file"
 msgstr "嘗試刪除檔案"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
+msgid "set in ui.py"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
 msgid "Advanced search"
 msgstr "進階搜尋"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
 msgid "&Search:"
 msgstr "搜尋(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
 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/trunk/src/calibre/gui2/main_ui.py:372
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
 msgid "Reset Quick Search"
 msgstr "重設快速搜尋"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
 msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:412
 msgid "Sort by &popularity"
 msgstr "依熱門程度排序(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:413
 msgid "Match any"
 msgstr "符合任何"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:414
 msgid "Match all"
 msgstr "符合全部"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:415
+msgid "Create, edit, and delete user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:416
+msgid "Manage &user categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:417
 msgid "Add books"
 msgstr "加入書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:418
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:420
 msgid "Remove books"
 msgstr "移除書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:421
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:422
 msgid "Edit meta information"
 msgstr "編輯元數據資訊"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:423
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:424
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:425
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:426
 msgid "Send to device"
 msgstr "傳送到裝置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:347
+#: /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 "儲存至磁碟"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:428
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:429
 msgid "Fetch news"
 msgstr "取回新聞"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:430
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:431
 msgid "Convert E-books"
 msgstr "轉換電子書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:432
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
 msgid "View"
 msgstr "檢視"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:434
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:435
 msgid "Open containing folder"
 msgstr "開啟包含的資料夾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:436
 msgid "Show book details"
 msgstr "顯示書籍詳細資料"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:437
 msgid "Books by same author"
 msgstr "同樣作者的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:438
 msgid "Books in this series"
 msgstr "在這套叢書中的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:439
 msgid "Books by this publisher"
 msgstr "這個出版社的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:440
 msgid "Books with the same tags"
 msgstr "同樣標籤的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:442
 msgid "Configure calibre"
 msgstr "設定 calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:443
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20
+#: /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 "將主控台輸出重新導向到對話盒視窗（包含 stdout 和 stderr）。用於像 windows 之類 GUI 程式沒有輸出串流時。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
 msgstr "偏好設定(&P)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
 msgstr "結束(&Q)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
 msgstr "錯誤：未處理的例外"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
 msgstr "具有書名或 ISBN 的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
 msgstr "找不到這本書的符合項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:238
 msgid "Search"
 msgstr "搜尋"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:292
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
 msgstr "請按下按鍵..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
 msgstr "已經指派"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
 msgstr "已經指派給"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /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/trunk/src/calibre/gui2/shortcuts.py:133
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
 msgid "&Default"
 msgstr "預設值(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
 msgstr "自訂捷徑鍵"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
 msgstr "按鍵"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
 msgstr "雙擊以變更"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
 msgstr "框架"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
 msgstr "自訂(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
 msgstr "捷徑(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:72
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:74
-#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79
+#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
 msgstr "替代的捷徑鍵(&A):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:24
 msgid "Jobs:"
 msgstr "工作："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:32
 msgid "Click to see list of active jobs."
 msgstr "點選以查看使用中的工作清單。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
-msgstr "點選以封面來瀏覽書籍"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Hide Book Details"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr "點選以關閉封面瀏覽"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:83
+msgid "Show Book Details"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:206
-msgid ""
-"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-"module failed:<br>"
-msgstr "<p>依書籍封面瀏覽已停用。<br>匯入 pictureflow 模組失敗：<br>"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Hide Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
-msgstr "點選以標籤來瀏覽書籍"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:84
+msgid "Show Tag Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr "作者"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Hide Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr "出版商"
+#: /home/kovid/work/calibre/src/calibre/gui2/sidebar.py:85
+msgid "Show Cover Browser"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:151
+#: /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:148
+msgid "Rename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:153
+msgid "Hide category %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:156
+msgid "Show category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:160
+msgid "Show all categories"
+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
+msgid "Manage Saved Searches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:182
+msgid "Manage User Categories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:244
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:439
+msgid "The name %s is already used."
+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 "轉換書籍 %d / %d (%s)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:202
+#: /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/trunk/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203
+#: /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 "無法轉換 %d / %d 書，因為找不到合適的來源格式。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
 msgstr "大量轉換的佇列中的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "佇列中 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
 msgid "Fetch news from "
 msgstr "取回新聞於 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
 msgid "Convert existing"
 msgstr "轉換現有的"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:300
+#: /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 "下列書籍已經被轉換為 %s 格式。您希望重新轉換它們嗎？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:70
 msgid "Save single format to disk..."
 msgstr "儲存單一格式到磁碟..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:148
+#: /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/trunk/src/calibre/gui2/ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:191
 msgid "Error communicating with device"
 msgstr "與裝置連線時發生錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:208
 msgid "&Restore"
 msgstr "還原(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:210
 msgid "&Donate to support calibre"
 msgstr "捐款支援 calibre (&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:213
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:218
 msgid "&Restart"
 msgstr "重新啟動(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:258
 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/trunk/src/calibre/gui2/ui.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:264
 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/trunk/src/calibre/gui2/ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 msgid "Edit metadata individually"
 msgstr "個別編輯元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:283
 msgid "Edit metadata in bulk"
 msgstr "大量編輯元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:285
 msgid "Download metadata and covers"
 msgstr "下載元數據和封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
 msgid "Download only metadata"
 msgstr "只下載元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:287
 msgid "Download only covers"
 msgstr "只下載封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:288
 msgid "Download only social metadata"
 msgstr "只下載社交網路元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:301
 msgid "Add books from a single directory"
 msgstr "從單一目錄加入書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:294
+#: /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/trunk/src/calibre/gui2/ui.py:297
+#: /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/trunk/src/calibre/gui2/ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:308
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "加入空的電子書（沒有格式的書籍）"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
 msgid "Save to disk in a single directory"
 msgstr "儲存到磁碟的單一目錄"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2172
+#: /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 "只儲存 %s 格式到磁碟"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:358
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 msgid "View specific format"
 msgstr "檢視指定的格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
 msgid "Remove selected books"
 msgstr "移除選取的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Remove files of a specific format from selected books.."
 msgstr "從選取書籍中移除指定格式的檔案.."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379
 msgid "Remove all formats from selected books, except..."
 msgstr "從選取書籍移除所有的格式，除了..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Remove covers from selected books"
 msgstr "移除選取的書籍中的封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:420
 msgid "Convert individually"
 msgstr "個別轉換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:421
 msgid "Bulk convert"
 msgstr "大量轉換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "Create catalog of books in your calibre library"
 msgstr "在您的 calibre 書庫建立書籍的分類"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:440
 msgid "Run welcome wizard"
 msgstr "執行歡迎精靈"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:480
 msgid "Similar books..."
 msgstr "類似的書籍..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:568
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre 快速使用指南"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:745
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:695
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
 msgid "Browse by covers"
 msgstr "依封面瀏覽"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:806
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:874
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:879
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:881
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:991
 msgid "Device: "
 msgstr "裝置： "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:993
 msgid " detected."
 msgstr " 被偵測到。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1025
 msgid "Connected "
 msgstr "已連線 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
 msgid "Device database corrupted"
 msgstr "裝置資料庫已損毀"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1038
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -6628,204 +7337,210 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1180
+#: /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 "只使用書庫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1181
+#: /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 "使用者註記只從主要書庫產生"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1917
+#: /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 "尚未選取書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1110
 msgid "No books selected to fetch annotations from"
 msgstr "沒有選取書籍以取回註記"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1037
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1135
 msgid "Merging user annotations into database"
 msgstr "將使用者註記合併到資料庫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1163
 msgid "%s<br />Last Page Read: %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1071
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1169
 msgid "%s<br />Last Page Read: Location %d (%d%%)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1090
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1188
 msgid "<b>Location %d &bull; %s</b><br />%s<br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1197
 msgid "<b>Page %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1202
 msgid "<b>Location %d &bull; %s</b><br />"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1322
 msgid "How many empty books?"
 msgstr "有多少空白書籍？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1225
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1323
 msgid "How many empty books should be added?"
 msgstr "有多少空白書籍要加入？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1324
+#: /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 "正在上傳書籍到裝置。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1285
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1383
 msgid "EPUB Books"
 msgstr "EPUB 書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1384
 msgid "LRF Books"
 msgstr "LRF 書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 msgid "HTML Books"
 msgstr "HTML 書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1386
 msgid "LIT Books"
 msgstr "LIT 書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1387
 msgid "MOBI Books"
 msgstr "MOBI 書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1388
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1389
 msgid "Text books"
 msgstr "純文字書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1390
 msgid "PDF Books"
 msgstr "PDF 書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1391
 msgid "Comics"
 msgstr "漫畫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1392
 msgid "Archives"
 msgstr "壓縮檔"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1396
 msgid "Supported books"
 msgstr "支援的書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1431
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1432
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1343
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1441
 msgid "Failed to read metadata"
 msgstr "無法讀取元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1344
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1442
 msgid "Failed to read metadata from the following"
 msgstr "無法從以下項目讀取元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1364
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1462
 msgid "Cannot delete"
 msgstr "無法刪除"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2077
+#: /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 "尚未選取書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1475
 msgid "Choose formats to be deleted"
 msgstr "選擇要刪除的格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1493
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "選擇<b>不要</b>刪除的格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1433
+#: /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 "選取的書籍會被<b>永久刪除</b>而檔案會從您的電腦中移除。您確定嗎？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1460
+#: /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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1563
 msgid "Deleting books from device."
 msgstr "正在從裝置中刪除書籍。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1594
 msgid "Cannot download metadata"
 msgstr "不能下載元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
 msgid "social metadata"
 msgstr "社交網路元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "covers"
 msgstr "封面"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1612
 msgid "metadata"
 msgstr "元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1614
 msgid "Downloading %s for %d book(s)"
 msgstr "正在下載 %s，用於 %d 書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1533
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1636
 msgid "Failed to download some metadata"
 msgstr "下載部分元數據失敗"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1637
 msgid "Failed to download metadata for the following:"
 msgstr "以下項目下載元數據失敗："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1640
 msgid "Failed to download metadata:"
 msgstr "下載元數據失敗："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1586
+#: /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 "不能編輯元數據"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1610
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1714
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1615
+#: /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 "
@@ -6833,7 +7548,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /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 "
@@ -6843,46 +7558,46 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 msgid "Cannot save to disk"
 msgstr "不能儲存到磁碟"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1736
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1843
 msgid "Choose destination directory"
 msgstr "選擇目的端目錄"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1876
 msgid "Error while saving"
 msgstr "當儲存時發生錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1877
 msgid "There was an error while saving."
 msgstr "當儲存時發生錯誤。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1778
+#: /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 "不能儲存某些書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1779
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1886
 msgid "Click the show details button to see which ones."
 msgstr "點選顯示詳細資料按鈕"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1800
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 msgid "No books selected to generate catalog for"
 msgstr "沒有選取書籍來建立分類"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1817
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1924
 msgid "Generating %s catalog..."
 msgstr "正在產生 %s 分類.."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1930
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -6890,48 +7605,44 @@ msgstr ""
 "沒有可分類的書籍\n"
 "請檢查排除的標籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1940
 msgid "Catalog generated."
 msgstr "分類已產生。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1943
 msgid "Export Catalog Directory"
 msgstr "匯出分類目錄"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1944
 msgid "Select destination for %s.%s"
 msgstr "選擇 %s 的目的端。%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1851
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1958
 msgid "Fetching news from "
 msgstr "取回新聞於 "
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1972
 msgid " fetched."
 msgstr " 已取回。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2023
 msgid "Cannot convert"
 msgstr "不能轉換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2052
 msgid "Starting conversion of %d book(s)"
 msgstr "正在開始 %d 本書的轉換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2114
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2226
 msgid "Cannot view"
 msgstr "不能檢視"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr "不能開啟資料夾"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2098
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2182
 msgid "Multiple Books Selected"
 msgstr "已選取多個書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /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 "
@@ -6939,66 +7650,79 @@ msgid ""
 "continue?"
 msgstr "您正嘗試開啟 %d 本書。同時開啟太多書可能會很慢並且對您的電腦的回應有負面效果。當這個程序開始後直到完成之前都不能停止。您想要繼續嗎？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2192
+msgid "Cannot open folder"
+msgstr "不能開啟資料夾"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2227
 msgid "%s has no available formats."
 msgstr "%s 沒有可用的格式。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2268
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2273
 msgid "Cannot configure"
 msgstr "不能設定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2269
 msgid "Cannot configure while there are running jobs."
 msgstr "當有工作仍在進行時不能設定。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2274
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2322
 msgid "No detailed info available"
 msgstr "沒有詳細資訊可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2323
 msgid "No detailed information is available for books on the device."
 msgstr "在這個裝置上的書籍沒有詳細資訊可用。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2257
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2373
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2379
 msgid "Error talking to device"
 msgstr "與裝置連繫時發生錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2258
+#: /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 "與裝置連繫時發生暫時性錯誤。請拔除裝置後重新連線或重新開機。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2403
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2431
 msgid "Conversion Error"
 msgstr "轉換時發生錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2404
 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/trunk/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2417
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2432
 msgid "<b>Failed</b>"
 msgstr "<b>失敗</b>"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2479
 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/trunk/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2504
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "還有使用中的工作。您確定要結束？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2507
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7008,28 +7732,28 @@ msgstr ""
 "                      現在結束可能造成裝置上的損毀。<br>\n"
 "                      您確定要結束？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2511
 msgid "WARNING: Active jobs"
 msgstr "警告：使用中的工作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2563
 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/trunk/src/calibre/gui2/ui.py:2461
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2582
 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/trunk/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2590
 msgid "Update available"
 msgstr "有更新可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2591
 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?"
@@ -7037,385 +7761,385 @@ msgstr ""
 "%s 已經更新到版本 %s。請查閱<a href=\"http://calibre-ebook.com/whats-"
 "new\">新的功能</a>。要前往下載頁面嗎？"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
 msgstr "編輯書籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
 msgstr "書籤的新標題："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
 msgstr "匯出書籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
 msgstr "已儲存書籤 (*.pickle)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
 msgstr "匯入書籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
 msgstr "名稱"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
 msgstr "書籤管理員"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
 msgstr "動作"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
 msgstr "編輯"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
 msgstr "刪除"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
 msgstr "重設"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
 msgstr "匯出"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
 msgstr "匯入"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
 msgstr "設定電子書檢視器"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
 msgstr "字型選項(&F)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
 msgstr "襯線字族(&R):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
 msgstr "無襯線字族(&S):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
 msgstr "預設字型大小(&D):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168
+#: /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 " px"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
 msgstr "標準字型(&T):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164
 msgid "Serif"
 msgstr "襯線"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165
 msgid "Sans-serif"
 msgstr "無襯線"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166
 msgid "Monospace"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167
 msgid "Remember last used &window size"
 msgstr "記住上次使用的視窗大小(&W)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
 msgstr "最大檢視寬度(&V):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170
 msgid "H&yphenate (break line in the middle of large words)"
 msgstr "連字符（很長的文字中間的中斷線）(&Y)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:171
+#: /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/trunk/src/calibre/gui2/viewer/config_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
 msgstr "連字符的預設語言(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
 msgstr "重訂大於檢視器視窗的圖片尺寸（需重新啟動）(&R)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
 msgstr "使用者樣式表(&U)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
 msgstr "一般(&G)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
 msgstr "雙擊以改變鍵盤捷徑鍵"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
 msgstr "鍵盤捷徑鍵(&K)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
 msgstr "找不到此項的結果："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
 msgstr "用來自訂電子書檢視器的選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:675
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:44
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81
+#: /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 "設定使用者 CSS 樣式表。這可以用來自訂所有書籍的外觀。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46
 msgid "Maximum width of the viewer window, in pixels."
 msgstr "檢視器視窗的最大寬度，以像素計。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
 msgstr "連字符文字"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
 msgstr "連字符規則的預設語言"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
 msgstr "字型選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
 msgstr "襯線字型族系"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
 msgstr "無襯線字型族系"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
 msgstr "標準字型大小(px)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
 msgstr "標準字型類型"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
 msgstr "在字典中查詢(&L)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:455
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138
+#: /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/trunk/src/calibre/gui2/viewer/documentview.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
 msgstr "捲動到下一頁"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
 msgstr "捲動到前一頁"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
 msgstr "捲動到下一節"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
 msgstr "捲動到上一節"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
 msgstr "捲動到這節的底部"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
 msgstr "捲動到這節的頂端"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
 msgstr "捲動到文件的結尾"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
 msgstr "捲動到文件的開頭"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
 msgstr "向下捲動"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
 msgstr "向上捲動"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
 msgstr "向左捲動"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
 msgstr "向右捲動"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
 msgstr "書籍格式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
 msgstr "書籍中的位置"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:191
+#: /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/trunk/src/calibre/gui2/viewer/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
 msgstr "搜尋書籍中的文字"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
 msgstr "預覽列印"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "連線到 dict.org 查詢：<b>%s</b>&hellip;"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
 msgstr "選擇電子書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
 msgstr "電子書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
 msgstr "加入書籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
 msgstr "請輸入書籤的標題："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
 msgstr "找不到符合項：%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
 msgstr "正在載入 flow..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
 msgstr "管理書籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
 msgstr "正在載入電子書..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
 msgstr "DRM 錯誤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:587
+#: /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>這本書有 <a href=\"%s\">DRM</a> 保護"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
 msgstr "無法開啟電子書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
 msgstr "用來控制電子書檢視器的選項"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:672
+#: /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/trunk/src/calibre/gui2/viewer/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Print javascript alert and console messages to the console"
 msgstr "在主控台中顯示 javascript 警示及主控台訊息"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:683
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:683
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -7425,91 +8149,91 @@ msgstr ""
 "\n"
 "檢視電子書。\n"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
 msgstr "關閉字典"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
 msgstr "工具列"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
 msgstr "下一頁"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
 msgstr "上一頁"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
 msgstr "字型變大"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
 msgstr "字型變小"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
 msgstr "找下一個"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
 msgstr "複製到剪貼簿"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
 msgstr "參考模式"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
 msgstr "書籤"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
 msgstr "切換会螢幕"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
 msgstr "列印"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr "列印電子書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
 msgid "Paste Image"
 msgstr "貼上圖片"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
 msgid ""
 "Library\n"
 "%d\n"
@@ -7519,7 +8243,7 @@ msgstr ""
 "%d\n"
 "本書"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
 msgid ""
 "Reader\n"
 "%s\n"
@@ -7529,7 +8253,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
 msgid ""
 "Card A\n"
 "%s\n"
@@ -7539,7 +8263,7 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
 msgid ""
 "Card B\n"
 "%s\n"
@@ -7549,43 +8273,47 @@ msgstr ""
 "%s\n"
 "可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:233
 msgid "Click to see the books available on your computer"
 msgstr "按這裡查看您的電腦上有多少書籍可用"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
 msgid "Click to see the books in the main memory of your reader"
 msgstr "按這裡查看您的閱讀器主記憶體中有多少書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
 msgid "Click to see the books on storage card A in your reader"
 msgstr "按這裡查看您的閱讀器記憶卡 A 中有多少書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Click to see the books on storage card B in your reader"
 msgstr "按這裡查看您的閱讀器記憶卡 B 中有多少書籍"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:246
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:504
 msgid "Change Case"
 msgstr "變更大小寫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:505
 msgid "Upper Case"
 msgstr "全大寫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:506
 msgid "Lower Case"
 msgstr "全小寫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:507
 msgid "Swap Case"
 msgstr "大小寫互換"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:508
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:373
+#: /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 "
@@ -7593,13 +8321,13 @@ msgid ""
 msgstr ""
 "如果您在 Android 手機上使用 WordPlayer 電子書軟體，您可以在裝置上直接存取您的 calibre 藏書。要這麼做必須先開啟內容伺服器。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:377
+#: /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 "請記得保持 calibre 執行，因為伺服器只會在 calibre 執行時才能運作。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:379
+#: /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 "
@@ -7608,78 +8336,71 @@ msgstr ""
 "您必須在 WordPlayer 中將 URL http://myhostname:8080 加入為您的 calibre 書庫。在這裡 "
 "myhostname 應該為執行 calibre 的電腦的合格主機名稱或 IP 位址。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
 msgstr "正在移動書庫..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:472
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:473
+#: /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/trunk/src/calibre/gui2/wizard/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
 msgstr "無效的資料庫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:528
+#: /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 "<p>有一個無效的書庫位於 %s，在嘗試移動現有的書庫前請刪除宅。<br>錯誤：%s"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
 msgstr "無法移動書庫"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:668
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr "歡迎精靈"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:48
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42
+#: /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 "歡迎使用 calibre"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:50
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:47
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:51
+#: /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/trunk/src/calibre/gui2/wizard/device_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
 msgstr "製造商(&M)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
 msgstr "裝置(&D)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr "精靈頁面"
-
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:48
+#: /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 "<h2>恭喜！</h2>您已經成功的設定 calibre。請按 %s 按鈕來套用您的設定值。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:49
+#: /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>."
@@ -7687,7 +8408,7 @@ msgstr ""
 "<h2>示範影片</h2>示範 calibre 各項功能的影片可以在<a href=\"http://calibre-"
 "ebook.com/demo\">線上</a>取得。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:50
+#: /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>."
@@ -7695,7 +8416,7 @@ msgstr ""
 "<h2>使用者手冊</h2>使用者手冊也可以在<a href=\"http://calibre-"
 "ebook.com/user_manual\">線上</a>取得。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:44
+#: /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 "
@@ -7707,25 +8428,25 @@ msgstr ""
 "href=\"http://gmail.com\">gmail 帳號</a>並按下列的「使用 gmail」按鈕。您同時也需要在自己的 Amazon "
 "帳號中註冊這個 gmail 位址。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
 msgstr "&Kindle 電子郵件："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
 msgstr "請選擇您的語言(&L):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53
+#: /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 "請選擇您書籍的位置。當您將書籍加入 calibre 時，它們會被複製到這裡："
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
 msgstr "變更(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55
+#: /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 "
@@ -7733,125 +8454,125 @@ msgid ""
 msgstr ""
 "如果您已經有 calibre 書庫，它會被複製到新的位置。如果新的 calibre 書庫已存在這個新的位置上，calibre 會轉而使用它。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
 msgstr "使用： %s:%s@%s:%s 和 %s 加密"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
 msgstr "傳送中..."
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
 msgstr "郵件成功的傳送"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
 msgstr "結束 gmail 設定"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:115
+#: /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 "不要忘記您的 gmail 使用者名稱和密碼。您可以在 http://gmail.com 註冊一個免費的 gmail 帳號"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:123
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:130
+#: /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/trunk/src/calibre/gui2/wizard/send_email.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
 msgstr "您必須設定寄件者電子郵件位址"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:131
+#: /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/trunk/src/calibre/gui2/wizard/send_email_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
 msgstr "傳送電子郵件於(&F):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109
+#: /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>這是由 calibre 寄出電子郵件的「寄件者：」欄位的內容。<br>請將它設為您的電子郵件位址"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:110
+#: /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>郵件伺服器是很有用的，尤其是您要傳送郵件的服務只接受知名的郵件服務的時候。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111
 msgid "Mail &Server"
 msgstr "郵件伺服器(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112
+#: /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 可以<b>選擇性的</b>使用伺服器來傳送郵件"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
 msgstr "主機名稱(&H):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114
+#: /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 "您的郵件伺服器主機名稱。例如：smtp.gmail.com"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
 msgstr "連接埠(&P):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116
+#: /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 "您的郵件伺服器聽取連線的連接埠。預設為 25"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
 msgstr "您在郵件伺服器上的使用者名稱"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
 msgstr "您在郵件伺服器上的密碼"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
 msgstr "顯示(&S)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122
 msgid "&Encryption:"
 msgstr "加密(&E):"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123
+#: /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 "連線到郵件伺服器時使用 TLS 加密。這是最常用的。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "&TLS"
 msgstr "&TLS"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
 msgid "Use SSL encryption when connecting to the mail server."
 msgstr "連線到郵件伺服器時使用 SSL 加密。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
 msgstr "&SSL"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Use Gmail"
 msgstr "使用 Gmail"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
 msgstr "測試電子郵件(&T)"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44
+#: /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 "
@@ -7862,45 +8583,56 @@ msgstr ""
 "href=\"http://www.lexcycle.com/download\">Stanza</a> 電子書軟體，您可以直接在裝置上存取您的 "
 "calibre 藏書。要這麼做您需要先開啟 calibre 內容伺服器。"
 
-#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
 msgstr "開啟內容伺服器(&C)"
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
-msgstr "用來控制 calibre 內容伺服器的設定值"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:256
+msgid "today"
+msgstr ""
 
-#: /home/kovid/work/trunk/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/caches.py:259
+msgid "yesterday"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
-msgstr "伺服器逾時秒數。預設值為 %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:262
+msgid "thismonth"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:16
-msgid "The max number of worker threads to use. Default is %default"
-msgstr "要使用的 worker 執行緒最大數目。預設值為 %default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:265
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:266
+msgid "daysago"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
-msgstr "設定限制存取的密碼。預設的存取是沒有限制的。"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "no"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
-msgstr "存取的使用者名稱。預設的狀況下，它是：%default"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:416
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:426
+msgid "unchecked"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
-msgstr "顯示封面的最大尺寸。預設值為 %default。"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "checked"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/__init__.py:26
-msgid ""
-"The maximum number of matches to return per OPDS query. This affects Stanza, "
-"WordPlayer, etc. integration."
-msgstr "每次 OPDS 查詢傳回符合項的最大數目。這會影響 Stanza、WordPlayer 等的整合。"
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:419
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:429
+msgid "yes"
+msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+msgid "blank"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:423
+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"
@@ -7913,7 +8645,7 @@ msgstr ""
 "預設值：「%%default」\n"
 "可套用到：CSV、XML 輸出格式"
 
-#: /home/kovid/work/trunk/src/calibre/library/catalog.py:51
+#: /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"
@@ -7925,7 +8657,7 @@ msgstr ""
 "預設值：「%default」\n"
 "可套用到：CSV、XML 輸出格式"
 
-#: /home/kovid/work/trunk/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"
@@ -7935,7 +8667,7 @@ msgstr ""
 "預設：「%default」\n"
 "套用到：ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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 "
@@ -7947,14 +8679,14 @@ msgstr ""
 "預設：「%default」沒有\n"
 "套用到：ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -7967,21 +8699,21 @@ msgstr ""
 "預設值為：「%default」\n"
 "套用到： ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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"
@@ -7991,7 +8723,7 @@ msgstr ""
 "預設值為：「%default」\n"
 "套用到： ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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"
@@ -8005,7 +8737,7 @@ msgstr ""
 "預設值為：「%default」\n"
 "套用到： ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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 "
@@ -8018,7 +8750,7 @@ msgstr ""
 "預設值：「%default」\n"
 "套用到：ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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"
@@ -8028,13 +8760,13 @@ msgstr ""
 "預設值：「%default」\n"
 "套用到：ePub、MOBI 輸出格式"
 
-#: /home/kovid/work/trunk/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 "calibre 書庫的路徑。預設值會使用儲存在設定值中的路徑。"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
@@ -8044,7 +8776,7 @@ msgstr ""
 "\n"
 "列出在 calibre 資料庫中可用的書籍。\n"
 
-#: /home/kovid/work/trunk/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"
@@ -8056,7 +8788,7 @@ msgstr ""
 "可用的欄位：%s\n"
 "預設值：%%default。使用特殊欄位「all」會選取所有欄位。只會影響文字輸出格式。"
 
-#: /home/kovid/work/trunk/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"
@@ -8066,54 +8798,48 @@ msgstr ""
 "可用的欄位：%s\n"
 "預設值：%%default"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:241
-msgid ""
-"The format in which to output the data. Available choices: %s. Defaults is "
-"text."
-msgstr "輸出資料時要使用的格式。可用的選擇有：%s。預設值為文字。"
-
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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 "下列書籍無法加入，因為它們已經在資料庫中（請看 --duplicates 選項）："
 
-#: /home/kovid/work/trunk/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"
@@ -8126,43 +8852,43 @@ msgstr ""
 "將指定的檔案加入資料庫成為書籍。您也可以指定目錄，\n"
 "請看下列的目錄相關選項。\n"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
 msgstr "循環處理目錄"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8175,11 +8901,11 @@ msgstr ""
 "移除以資料庫中的 id 指定的書籍。其中 ids 為 id 號碼，可使用以逗號分隔的方式（您可以使用 list 指令來取得 id 號碼）例如： "
 "23,34,57-85\n"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8188,15 +8914,15 @@ msgid ""
 "already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "您必須至少指定一個 id 和電子書檔案"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8206,11 +8932,11 @@ msgid ""
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "您必須指定 id 和格式"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8225,15 +8951,15 @@ msgstr ""
 "顯示以 id 指定的書籍在 calibre 資料庫中儲存的元數據。\n"
 "id 是以 list 指令取得的 id 號碼。\n"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
 msgstr "以 OPF 格式顯示元數據 (XML)"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
 msgstr "您必須指定 id"
 
-#: /home/kovid/work/trunk/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"
@@ -8246,11 +8972,11 @@ msgid ""
 "show_metadata command.\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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 "您必須指定 id 和元數據檔案"
 
-#: /home/kovid/work/trunk/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8266,27 +8992,27 @@ msgstr ""
 "匯出的動作會儲存書籍的所有格式、封面和元數據（在\n"
 "opf 檔案中）。您可以用 list 指令取得 id 編號。\n"
 
-#: /home/kovid/work/trunk/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 "匯出資料庫中所有的書籍，略過清單上的 id。"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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 "您必須指定一些 id 或 %s 選項"
 
-#: /home/kovid/work/trunk/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"
@@ -8297,23 +9023,23 @@ msgid ""
 "datatype is one of: {0}\n"
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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"
@@ -8330,7 +9056,7 @@ msgstr ""
 "    Options 會控制產生的分類輸出要如何顯示項目。\n"
 "    "
 
-#: /home/kovid/work/trunk/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"
@@ -8340,23 +9066,23 @@ msgstr ""
 "如果宣告了，會忽略 --search。\n"
 "預設值：all"
 
-#: /home/kovid/work/trunk/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/trunk/src/calibre/library/cli.py:753
-#: /home/kovid/work/trunk/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:503
 msgid "Show detailed output information. Useful for debugging"
 msgstr "顯示詳細的輸出資訊。除錯時很有用"
 
-#: /home/kovid/work/trunk/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/trunk/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"
@@ -8368,17 +9094,17 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8387,19 +9113,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:750
 msgid "y"
 msgstr ""
 
-#: /home/kovid/work/trunk/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"
@@ -8409,15 +9135,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:787
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8437,111 +9163,127 @@ msgstr ""
 "\n"
 "需要個別指令的說明： %%prog command --help\n"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:495
+msgid "Main"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:497
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:499
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1550
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>將舊的資料庫轉移到 %s 的電子書庫<br><center>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1579
 msgid "Copying <b>%s</b>"
 msgstr "正在複製 <b>%s</b>"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
 msgid "Compacting database"
 msgstr "正在壓實資料庫"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1689
 msgid "Checking SQL integrity..."
 msgstr "正在檢查 SQL 完整性..."
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1728
 msgid "Checking for missing files."
 msgstr "正在檢查缺少的檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1750
 msgid "Checked id"
 msgstr "已檢查 id"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
+msgid "Ratings"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
 msgstr "標題"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
 msgstr "作者"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26
+#: /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 "作者排序字串。要只使用名字的第一個字母請使用 {author_sort[0]}"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:28
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
 msgstr "標籤"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
 msgstr "叢書"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30
+#: /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/trunk/src/calibre/library/save_to_disk.py:33
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
 msgstr "評等"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
 msgstr "出版社"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
 msgstr "日期"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
 msgstr "出版日期"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
 msgstr "calibre 內部 id"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
 msgstr "用來控制儲存至磁碟的選項"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54
+#: /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 "通常，calibre 會從書庫更新儲存檔案中的元數據。這會讓儲存到磁碟的速度變慢。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:57
+#: /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 "通常，calibre 會將元數據一同寫入實際的電子書檔案和另外的 OPF 檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:60
+#: /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 "通常，calibre 會將封面一同寫入實際的電子書檔案和另外的 OPF 檔案。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:63
+#: /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/trunk/src/calibre/library/save_to_disk.py:66
+#: /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 "
@@ -8550,7 +9292,7 @@ msgid ""
 msgstr ""
 "這個範本控制了儲存檔案的檔案名稱和目錄結構。預設值為「%s」，會將書籍儲存為以作者為子目錄且檔案名稱包含書名和作者。可用的控制項有：{%s}"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71
+#: /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 "
@@ -8559,7 +9301,7 @@ msgid ""
 msgstr ""
 "這個範本控制了傳送到裝置檔案的檔案名稱和目錄結構。預設值為「%s」，會將書籍儲存為以作者為子目錄且檔案名稱包含書名和作者。可用的控制項有：{%s}"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78
+#: /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 "
@@ -8569,29 +9311,63 @@ msgstr ""
 "通常，calibre 會將所有的非英文字元轉換為英文同義字做為檔案名稱。警告：如果您將它關閉，您可能會在儲存時遇到錯誤，取決於您儲存的檔案系統對 "
 "unicode 支援程度。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84
+#: /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 "顯示日期的格式。%d - 日，%b - 月，%Y - 年。預設值為：%b, %Y"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:87
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
 msgstr "路徑轉換為小寫。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
 msgstr "以底線替代空格。"
 
-#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:258
+#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
 msgstr "要求的格式無法使用"
 
-#: /home/kovid/work/trunk/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 "用來控制 calibre 內容伺服器的設定值"
+
+#: /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 "伺服器逾時秒數。預設值為 %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 "要使用的 worker 執行緒最大數目。預設值為 %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 "存取的使用者名稱。預設的狀況下，它是：%default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr "顯示封面的最大尺寸。預設值為 %default。"
+
+#: /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 "每次 OPDS 查詢傳回符合項的最大數目。這會影響 Stanza、WordPlayer 等的整合。"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr "存取您 calibre 書庫的密碼。使用者名稱為 "
 
-#: /home/kovid/work/trunk/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
@@ -8601,345 +9377,389 @@ msgstr ""
 "\n"
 "啟動 calibre 內容伺服器。"
 
-#: /home/kovid/work/trunk/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/trunk/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 "將程序 PID 寫入指定的檔案"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:48
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112
+msgid "%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:124
+msgid "%d items"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:141
+msgid "RATING: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "TAGS: %s<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:148
+msgid "SERIES: %s [%s]<br />"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:189
+msgid "Library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:228
+msgid "Books in your library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:234
+msgid "By "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:235
+msgid "Books sorted by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:537
+msgid "Newest"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
 msgstr "%s用法%s：%s\n"
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:92
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid "Created by "
 msgstr "建立於 "
 
-#: /home/kovid/work/trunk/src/calibre/utils/config.py:93
+#: /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 "每當您傳送引數給 %prog 時，請用引號將引數包起來。"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
 msgstr "isbndb.com 的存取金鑰"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/config.py:670
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:690
 msgid "The priority of worker processes"
 msgstr "worker 程序的優先權"
 
-#: /home/kovid/work/trunk/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/trunk/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/trunk/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/trunk/src/calibre/utils/ipc/job.py:43
+#: /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/trunk/src/calibre/utils/ipc/job.py:51
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
 msgstr "已停止"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
 msgstr "已完成"
 
-#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:75
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
 msgstr "運算中…"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:93
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙文"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:94
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
 msgstr "英文 (英國)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
 msgstr "中文 (HK)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
 msgstr "英文"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
 msgstr "英文 (澳大利亞)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
 msgstr "英文 (紐西蘭)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
 msgstr "英文 (加拿大)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
 msgstr "英文 (印度)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
 msgstr "英文 (泰國)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
 msgstr "英文 (塞普勒斯)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
 msgstr "英文 (巴基斯坦)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Singapore)"
 msgstr "英文 (新加坡)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Yemen)"
 msgstr "英文 (葉門)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Ireland)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (China)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "German (AT)"
 msgstr "德文 (AT)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "Dutch (NL)"
 msgstr "荷蘭文 (NL)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (BE)"
 msgstr "荷蘭文 (BE)"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
 msgstr "主機必須是 使用者@主機名稱 的格式"
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr "無法驗證伺服器：%s"
 
-#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:234
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
 msgstr "控制郵件遞送"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
 msgid "Unknown feed"
 msgstr "未知的餵送"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
 msgid "Untitled article"
 msgstr "無標題的文章"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
 msgstr "從網際網路下載定期性內容"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:36
+#: /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/trunk/src/calibre/web/feeds/input.py:39
+#: /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/trunk/src/calibre/web/feeds/input.py:42
+#: /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/trunk/src/calibre/web/feeds/input.py:46
+#: /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/trunk/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
 msgid "Unknown News Source"
 msgstr "未知的新聞來源"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:595
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:692
 msgid "Download finished"
 msgstr "下載完成"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Failed to download the following articles:"
 msgstr "無法下載下列文章："
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:700
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:702
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704
 msgid "\tFailed links:"
 msgstr "\t失敗的連結："
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:821
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "無法取回文章。以 -vv 執行來查看原因。"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
 msgid "Fetching feeds..."
 msgstr "正在取回餵送..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Got feeds from index page"
 msgstr "從索引頁取得餵送"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:853
 msgid "Trying to download cover..."
 msgstr "正在嘗試下載封面..."
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:855
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:936
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952
 msgid "Feeds downloaded to %s"
 msgstr "將餵送下載到 %s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Could not download cover: %s"
 msgstr "無法下載封面：%s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Downloading cover from %s"
 msgstr "正在從 %s 下載封面"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1009
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1205
 msgid "Untitled Article"
 msgstr "無標題的文章"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1276
 msgid "Article downloaded: %s"
 msgstr "已下載的文章：%s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1287
 msgid "Article download failed: %s"
 msgstr "下載失敗的文章：%s"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1304
 msgid "Fetching feed"
 msgstr "正在取回餵送"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1451
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1467
 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/trunk/src/calibre/web/feeds/recipes/collection.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
 msgstr "您"
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:181
+#: /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/trunk/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:182
+#: /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/trunk/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
 msgid ""
 "%prog URL\n"
 "\n"
@@ -8949,48 +9769,48 @@ msgstr ""
 "\n"
 "URL 例如 http://google.com"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "儲存 URL 的基礎目錄。預設值為 %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:486
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr "等候伺服器回應的預設逾時時間。預設值：%default 秒"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr "循環層數的最大值，即跟隨連結的深度。預設值為 %default"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
 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/trunk/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr "持續抓取的最小間隔秒數。預設值為 %default 秒"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 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/trunk/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 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/trunk/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 "
@@ -9001,10 +9821,16 @@ msgstr ""
 "任何符合這個正規表示式的連結都會略過。這個選項可以多次指定，只要有連結符合任何正規表示式，它就會被略過。預設值為不略過任何連結。如果同時指定 --"
 "filter-regexp 和 --match-regexp，則會先套用 --filter-regexp。"
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 msgid "Do not download CSS stylesheets."
 msgstr "不要下載 CSS 樣式表。"
 
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "與 Sony PRS-600/700/900 eBook 閱讀器連接。"
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "與 Sony PRS-300/505/500 eBook 閱讀器連接。"
+
 #~ msgid "dummy option until real options are determined."
 #~ msgstr "在確實決定選項之前的暫時選項"
 
@@ -9017,12 +9843,33 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "~"
 #~ 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 ""
 #~ "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."
 #~ msgstr "不在輸出中進行文字兩端對齊. 無論文字是否已經兩端對齊和書籍格式及閱讀設備是否支持兩端對齊."
 
+#~ msgid "Click to browse books by their covers"
+#~ msgstr "點選以封面來瀏覽書籍"
+
+#~ msgid "Click to turn off Cover Browsing"
+#~ msgstr "點選以關閉封面瀏覽"
+
+#~ msgid "Click to browse books by tags"
+#~ msgstr "點選以標籤來瀏覽書籍"
+
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "選擇您的電子書庫的位置。"
 
@@ -9034,3 +9881,13 @@ msgstr "不要下載 CSS 樣式表。"
 
 #~ msgid "Ebook Viewer"
 #~ msgstr "電子書槍視器"
+
+#~ msgid ""
+#~ "The format in which to output the data. Available choices: %s. Defaults is "
+#~ "text."
+#~ msgstr "輸出資料時要使用的格式。可用的選擇有：%s。預設值為文字。"
+
+#~ msgid ""
+#~ "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+#~ "module failed:<br>"
+#~ msgstr "<p>依書籍封面瀏覽已停用。<br>匯入 pictureflow 模組失敗：<br>"