diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 94d8136c01..95b7aca854 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -160,7 +160,8 @@ class ITUNES(DevicePlugin):
                              }
 
                             if self.report_progress is not None:
-                                self.report_progress(i+1/book_count, _('%d of %d' % (i+1, book_count)))
+                                self.report_progress(i+1/book_count,
+                                        _('%d of %d') % (i+1, book_count))
 
                         if self.report_progress is not None:
                             self.report_progress(1.0, _('finished'))
@@ -653,7 +654,8 @@ class ITUNES(DevicePlugin):
 
                 # Report progress
                 if self.report_progress is not None:
-                    self.report_progress(i+1/file_count, _('%d of %d' % (i+1, file_count)))
+                    self.report_progress(i+1/file_count,
+                            _('%d of %d') % (i+1, file_count))
 
             if self.report_progress is not None:
                 self.report_progress(1.0, _('finished'))
diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
index f1775046b9..d2644a348e 100644
--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: calibre 0.6.55\n"
-"POT-Creation-Date: 2010-05-29 12:41+MDT\n"
-"PO-Revision-Date: 2010-05-29 12:41+MDT\n"
+"Project-Id-Version: calibre 0.6.95\n"
+"POT-Creation-Date: 2010-05-30 22:56+MDT\n"
+"PO-Revision-Date: 2010-05-30 22:56+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -15,363 +15,363 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\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: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/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:272
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
+#: /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:1760
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1763
+#: /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/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:237
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
 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 useful for documents that do not declare an encoding or that have erroneous 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:258
 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:292
 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:322
 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:333
 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:346
 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:358
 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:366
 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:379
 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:390
 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:425
 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:438
 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:452
 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:466
 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:248
 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:271
 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:283
 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:301
 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:310
 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:408
 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"
@@ -379,501 +379,536 @@ 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
-msgid "Communicate with the Binatone Readme eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:35
+msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13
-msgid "Communicate with the Blackberry smart phone."
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:40
+msgid "Apple device detected, launching iTunes, please wait..."
 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
-msgid "Kovid Goyal"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:100
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:103
+msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22
-msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:164
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:658
+msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24
-msgid "Communicate with the EB600 eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:167
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:661
+msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17
-msgid "Entourage Edge"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:258
+msgid ""
+"Certain books may only be deleted from within the iBooks app.\n"
+"Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/trunk/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
-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."
-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
-msgid "Device Interface"
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the IRex Digital Reader 800"
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the JetBook eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the Kindle 2 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:162
-msgid "Communicate with the Kindle DX eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:14
-msgid "Communicate with the Kobo Reader"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:15
-msgid "Communicate with the Palm Pre"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/misc.py:35
-msgid "Communicate with the Booq Avant"
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the Nokia 810 internet tablet."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20
-msgid "The Nook"
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the Nuut2 eBook reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/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/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
-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."
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the Teclast K3 reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/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
-msgid "Communicate with the iPapyrus reader."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:246
-msgid "Unable to detect the %s disk drive. Try rebooting."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:426
-msgid "Unable to detect the %s mount point. Try rebooting."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:491
-msgid "Unable to detect the %s disk drive."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:584
-msgid "Could not find mount helper: %s."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:596
-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
-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
-msgid "The reader has no storage card in this slot."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:745
-msgid "Selected slot: %s is not supported."
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:778
-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
-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
-msgid "News"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12
-msgid "Configure Device"
-msgstr ""
-
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:468
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:30
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/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/apple/driver.py:564
+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/calibre/src/calibre/devices/blackberry/driver.py:13
+msgid "Communicate with the Blackberry smart phone."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:90
+msgid "Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
+msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
+msgid "Communicate with the EB600 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
+msgid "Entourage Edge"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
+msgid "Communicate with the Entourage Edge."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
+msgid "Communicate with the ESlick eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
+msgid "Use an arbitrary folder as a device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
+#: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
+msgid "Device Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py: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/calibre/src/calibre/devices/irexdr/driver.py:42
+msgid "Communicate with the IRex Digital Reader 800"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
+msgid "Communicate with the Iriver Story reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
+msgid "Communicate with the JetBook eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+msgid "Communicate with the Kindle eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:147
+msgid "Communicate with the Kindle 2 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:157
+msgid "Communicate with the Kindle DX eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:14
+msgid "Communicate with the Kobo Reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
+msgid "Communicate with the Palm Pre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
+msgid "Communicate with the Booq Avant"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
+msgid "Communicate with the Nokia 770 internet tablet."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
+msgid "Communicate with the Nokia 810 internet tablet."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
+msgid "The Nook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
+msgid "Communicate with the Nook eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
+msgid "Communicate with the Nuut2 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
+msgid "Communicate with the Sony PRS-500 eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:23
+msgid "Communicate with all the Sony eBook readers."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+msgid "Comma separated list of metadata fields to turn into collections on the device. Possibilities include: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
+msgid "Communicate with the Samsung SNE eBook reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
+msgid "Communicate with the Teclast K3 reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
+msgid "Communicate with the Newsmy reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
+msgid "Communicate with the iPapyrus reader."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:247
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr ""
+
+#: /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/calibre/src/calibre/devices/usbms/device.py:492
+msgid "Unable to detect the %s disk drive."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:585
+msgid "Could not find mount helper: %s."
+msgstr ""
+
+#: /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/calibre/src/calibre/devices/usbms/device.py:605
+msgid "Unable to mount main memory (Error code: %d)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
+msgid "The reader has no storage card in this slot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:746
+msgid "Selected slot: %s is not supported."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
+msgid "There is insufficient free space in main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783
+msgid "There is insufficient free space on the storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:819
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:847
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py: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/field_metadata.py:120
+msgid "News"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
+msgid "Configure Device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py: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 ""
 
-#: /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 ""
 
-#: /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"
@@ -888,509 +923,509 @@ 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. For example resolution dependent lengths (i.e. lengths in pixels). Choices 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 cases, an output profile is required to produce documents that will work on a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
 
-#: /home/kovid/work/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 fonts in the output bigger and vice versa. By default, the base font size is chosen based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/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-large, with the final size being for huge fonts. The font rescaling algorithm uses these sizes to intelligently rescale fonts. The default is to use a mapping based on the output profile you chose."
 msgstr ""
 
-#: /home/kovid/work/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 page and other artifacts. This option will extract the content from the 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 \"part\" as chapter titles as well as any tags that have class=\"chapter\". The expression used must evaluate to a list of elements. To disable chapter detection, use the expression \"/\". See the XPath Tutorial in the calibre User Manual for further help on using this feature."
 msgstr ""
 
-#: /home/kovid/work/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 chapters. A value of \"none\" will disable chapter marking and a value of \"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/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 \"justify\" converts all unjustified text to justified. A value of \"original\" (the default) does not change justification in the source file. Note that only some output formats support justification."
 msgstr ""
 
-#: /home/kovid/work/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 will replace \"%s\" with \"Mikhail Gorbachiov\". Also, note that in cases where there are multiple representations of a character (characters shared by Chinese and Japanese for instance) the representation used by the largest number of people will be used (Chinese in the previous example)."
 msgstr ""
 
-#: /home/kovid/work/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 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/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 can be parsed faster and with less resources. However, splitting is slow and if your source file contains a very large number of page breaks, you should turn off splitting on page breaks."
 msgstr ""
 
-#: /home/kovid/work/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 JetBook Lite. Without this option, such devices will display the cover as a 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 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/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 can result in various nasty side effects in the rest of of the conversion 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"
@@ -1399,148 +1434,152 @@ 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:47
+#: /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:47
+#: /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"
@@ -1554,107 +1593,107 @@ 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"
@@ -1667,39 +1706,39 @@ 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"
@@ -1707,184 +1746,180 @@ 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:1372
 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:1373
 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:1374
+#: /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:1375
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
 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:1385
 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:1386
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1388
 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+ spaces) represents a paragraph. Paragraphs end when the next line that 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"
@@ -1896,111 +1931,111 @@ 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"
@@ -2009,33 +2044,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"
@@ -2050,1841 +2085,2032 @@ 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 the space after and will exceed the specified value. Also, there is a minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 
-#: /home/kovid/work/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:137
+#: /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:171
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
 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:227
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:240
 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:253
 msgid "Path error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:254
 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:258
+#: /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:259
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1892
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:325
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:338
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:339
 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:351
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:352
 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:355
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:421
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:474
 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: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: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/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/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/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:1141
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
 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], e.g., [Amazon Freebie]\n"
 "- A regex pattern of a single dot excludes all genre tags, generating no 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 understanding the conversion process and figuring out the correct values for 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 input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.</p>\n"
 "<p>By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile. </p>\n"
 "<p>See the <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-size-rescaling\">User Manual</a> for a discussion of how font size rescaling works.</p>"
 msgstr ""
 
-#: /home/kovid/work/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:75
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2137
 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:81
 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:81
 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:97
 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 <i>chapter</i>.</p><p>Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.</p><p>To learn more advanced usage of XPath see the <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/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:487
 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:488
 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: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/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:508
 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:511
 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:512
 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:513
 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:564
 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:565
 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:568
 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:580
 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:581
 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:590
 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:591
 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:599
 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:637
 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:638
 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:669
+msgid "You must select a column to delete it"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:674
+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/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
+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
 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:750
 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:778
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:730
 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:802
+#: /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:809
 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:810
 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:862
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:867
 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:863
 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:864
 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:868
 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:873
+msgid "Must restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:874
+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
 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:928
 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:933
 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:934
 msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly."
 msgstr ""
 
-#: /home/kovid/work/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"
 "to the existing book, instead of creating a new entry. If the existing book already has the format, then it is silently ignored.\n"
@@ -3892,627 +4118,764 @@ msgid ""
 "Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), 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:524
+#: /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:525
 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:526
 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:528
 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:529
 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:530
 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:531
 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:532
 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:533
 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:534
 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:535
 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:536
 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:537
 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:538
 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:539
 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:540
 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:543
 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:544
 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:545
 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:546
 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:547
 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:548
 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:549
 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:550
 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:551
 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:552
 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:553
 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:554
 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:555
 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:556
 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:557
 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: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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+msgid "Edit settings of a user-defined column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 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:567
 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:568
 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:569
 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:570
 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:571
 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:572
 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:573
 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:574
 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:575
 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:576
 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:577
 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:578
 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:579
 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:580
+#: /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:581
+#: /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:582
 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:583
 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:584
 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:585
+#: /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:586
 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:587
 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:588
 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:589
 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:590
 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:591
 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:592
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as calibre is running.\n"
 "<p>Stanza should see your calibre collection automatically. If not, try adding the URL http://myhostname:8080 as a new catalog in the Stanza reader on your iPhone. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
 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:595
 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:596
 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:597
 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:598
 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:599
 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:601
 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 indicate sub-folders. Available metadata variables are described below. If a particular book does not have some metadata, the variable will be replaced by the empty string."
 msgstr ""
 
 #:
-#: /home/kovid/work/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 <a href=\"http://www.isbndb.com\">free account</a> and enter your access key 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"
@@ -4520,599 +4883,687 @@ 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:1345
 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/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
-msgid "Are your sure?"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:72
+msgid "Authors"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor.py:67
-msgid "The following tags are used by one or more books. Are you certain you want to delete them?"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:47
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:101
+msgid "Publishers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:109
+msgid " (not on any book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:161
+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 ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+#: /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
+msgid "Are your sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69
+msgid "The following tags are used by one or more books. Are you certain you want to delete them?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py: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/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"
 "p, li { white-space: pre-wrap; }\n"
@@ -5120,60 +5571,60 @@ msgid ""
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news recipe, by adding RSS feeds to it. <br />For most feeds, you will have to use the \"Advanced mode\" to further customize the fetch process.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/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"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
@@ -5184,825 +5635,944 @@ msgid ""
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" font-weight:600;\">Test</span> functionality below to test your regular expression on a few sample filenames. The group names for the various metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/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
-msgid "Not allowed"
+#: /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
+msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:900
-msgid "Dropping onto a device is not supported. First add the book to the calibre library."
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:827
+msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/library.py:1100
+#: /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/trunk/src/calibre/gui2/library.py:1151
+#: /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/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:98
+msgid "Hide column %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:103
+msgid "Sort on %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:104
+msgid "Ascending"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:107
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:122
+msgid "Center"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:141
+msgid "Show column"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+msgid "Restore default layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:471
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:472
+msgid "Dropping onto a device is not supported. First add the book to the calibre library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
 msgstr ""
 
-#: /home/kovid/work/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:28
 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:30
 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:32
 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:34
 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:65
 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:74
 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:75
 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:145
 msgid "Repairing failed"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
 msgid "The database repair failed. Starting with a new empty library."
 msgstr ""
 
-#: /home/kovid/work/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:150
+#: /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:163
 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:173
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 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:187
 msgid "Corrupted database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
 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:194
 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:207
 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:250
 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:252
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
 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:256
 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:258
 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:260
 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:263
 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:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
 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
-msgid "Advanced search"
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
+msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/main_ui.py:368
-msgid "Alt+S"
+#: /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/trunk/src/calibre/gui2/main_ui.py:369
-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
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
 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:397
+msgid "Advanced search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
+msgid "Alt+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
+msgid "&Search:"
+msgstr ""
+
+#: /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/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:348
 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:362
 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:235
+#: /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/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:68
 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:155
 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:161
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:184
 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:201
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:203
 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:206
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:211
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:251
 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:257
 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:274
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:276
 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:278
 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:279
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:280
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:281
 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:285
 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:287
 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:294
 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:295
 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:298
 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:301
 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:349
 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:350
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2253
 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:353
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2256
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:368
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:370
 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:372
 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:374
 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:413
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:414
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:417
 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:433
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:473
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
 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:658
+msgid "Select folder to open as device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:769
 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:837
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:842
 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:844
+msgid "({0} of all)"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:901
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:954
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:903
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:956
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:931
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:988
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1000
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:944
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1001
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the following:\n"
@@ -6013,1163 +6583,1186 @@ 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:1064
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1241
 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:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1242
 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: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
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1073
 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:1098
 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:1126
 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:1132
 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:1151
 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:1160
 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:1165
 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:1285
 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:1286
 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:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1385
 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:1346
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1286
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1347
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1287
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1348
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1349
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1350
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1290
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1351
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1291
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1352
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1292
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1353
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1293
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1354
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1294
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1355
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1298
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1359
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1394
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
 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:1404
 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:1405
 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:1425
 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:1428
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2131
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1438
 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:1456
 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:1494
 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:1511
+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
 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:1557
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1573
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1509
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1575
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1511
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1577
 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:1599
 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:1600
 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:1603
 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:1614
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1652
 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:1673
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1676
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1611
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1677
 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:1681
 msgid "All book formats and metadata from the selected books will be added to the <b>first selected book.</b><br><br> The second and subsequently selected books will not be deleted or changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1626
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1692
 msgid "All book formats and metadata from the selected books will be merged into the <b>first selected book</b>.<br><br>After merger the second and subsequently selected books will be <b>deleted</b>. <br><br>All book formats of the first selected book will be kept and any duplicate formats in the second and subsequently selected books will be permanently <b>deleted</b> from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1638
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1704
 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:1803
 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:1806
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1769
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1839
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1840
 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:1847
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1848
 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:1849
 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:1870
 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:1887
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1893
 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:1903
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1836
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1906
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1837
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1907
 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:1921
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1865
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1935
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1916
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1986
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:1945
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2015
 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:2131
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2189
 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:2145
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2099
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2146
 msgid "You are attempting to open %d books. Opening too many books at once can be slow and have a negative effect on the responsiveness of your computer. Once started the process cannot be stopped until complete. Do you wish to continue?"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2115
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2155
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2190
 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:2231
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2236
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2232
 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:2237
+msgid "Cannot configure before calibre is restarted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2285
 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:2286
 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:2336
+msgid "Failed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2342
 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:2343
 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:2366
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2394
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2367
 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:2380
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2395
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
 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:2467
 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:2470
 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:2474
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2526
 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:2545
 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:2553
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2554
 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 <a href=\"http://gmail.com\">gmail account</a> and click the Use gmail button below. You will also have to register your gmail address in your Amazon account."
 msgstr ""
 
-#: /home/kovid/work/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 directly on the device. To do this you have to turn on the calibre content 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"
 "Available fields: %s.\n"
@@ -7177,7 +7770,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"
@@ -7185,28 +7778,28 @@ 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 conversion process a bug is occurring.\n"
 "Default: '%default'None\n"
 "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"
 "--exclude-tags=skip will match 'skip this book' and 'Skip will like this'.\n"
@@ -7214,28 +7807,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"
@@ -7244,82 +7837,78 @@ 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 'kindle_dx' creates a structured Table of Contents with Sections and Articles.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/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"
 "Available fields: %s\n"
 "Default: %%default. The special field \"all\" can be used to select all fields. Only has effect in the text output format."
 msgstr ""
 
-#: /home/kovid/work/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"
@@ -7327,65 +7916,65 @@ 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"
 "Remove the books identified by ids from the database. ids should be a comma separated list of id numbers (you can get id numbers by using the list command). For example, 23,34,57-85\n"
 msgstr ""
 
-#: /home/kovid/work/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"
 "Add the ebook in ebook_file to the available formats for the logical book identified by id. You can get id by using the list command. If the format already exists, it is replaced.\n"
 msgstr ""
 
-#: /home/kovid/work/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"
@@ -7393,11 +7982,11 @@ msgid ""
 "Remove the format fmt from the logical book identified by id. You can get id by using the list command. fmt should be a file extension like LRF or TXT or EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
 
-#: /home/kovid/work/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"
@@ -7406,15 +7995,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"
@@ -7425,11 +8014,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"
@@ -7438,27 +8027,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"
@@ -7467,19 +8056,19 @@ 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"
@@ -7489,29 +8078,29 @@ 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:497
 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"
@@ -7523,15 +8112,15 @@ 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"
@@ -7540,19 +8129,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"
@@ -7562,15 +8151,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"
@@ -7582,507 +8171,596 @@ 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:1444
 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:1473
 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:1490
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1583
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1621
 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:1643
 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 subdirectory with filenames containing title and author. Available controls 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 directory with filenames containing title and author. Available controls 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 experience errors when saving, depending on how well the filesystem you are 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
+#: /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: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:565
 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:654
 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:656
 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:662
 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:664
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
 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:747
 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:768
 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:773
 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:779
 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:781
 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:861
 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:877
 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:887
 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:899
 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:934
 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:1124
 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:1196
 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:1207
 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:1224
 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:1371
 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:1387
 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:474
 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:477
 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:480
 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:483
 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:486
 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:488
 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:490
 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:492
 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:494
 msgid "Any link that matches this regular expression will be ignored. This option can be specified multiple times, in which case as long as any regexp matches a link, it will be ignored.By default, no links are ignored. If both --filter-regexp and --match-regexp are specified, then --filter-regexp is applied first."
 msgstr ""
 
-#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid "Do not download CSS stylesheets."
 msgstr ""