IGN:Tag release

This commit is contained in:
Kovid Goyal 2011-01-21 15:57:39 -07:00
parent 9c364533e4
commit 1adb7dd452
3 changed files with 74 additions and 61 deletions

View File

@ -8,6 +8,8 @@
date: 2011-01-21 date: 2011-01-21
new features: new features:
- title: "0.7.42 is a re-release of 0.7.41, because conversion to MOBI was broken in 0.7.41"
- title: "Conversions: Replace the remove header/footer options with a more geenric search replace option, that allows you to not only remove but also replace text" - title: "Conversions: Replace the remove header/footer options with a more geenric search replace option, that allows you to not only remove but also replace text"
- title: "Conversion: The preprocess html option has now become a new 'Heuristic Processing' option which allows you to control exactly which heuristics are used" - title: "Conversion: The preprocess html option has now become a new 'Heuristic Processing' option which allows you to control exactly which heuristics are used"

View File

@ -84,13 +84,9 @@ def meta_info_to_oeb_metadata(mi, m, log, override_input_metadata=False):
if not mi.is_null('rights'): if not mi.is_null('rights'):
m.clear('rights') m.clear('rights')
m.add('rights', mi.rights) m.add('rights', mi.rights)
elif override_input_metadata:
m.clear('rights')
if not mi.is_null('publication_type'): if not mi.is_null('publication_type'):
m.clear('publication_type') m.clear('publication_type')
m.add('publication_type', mi.publication_type) m.add('publication_type', mi.publication_type)
elif override_input_metadata:
m.clear('publication_type')
if not m.timestamp: if not m.timestamp:
m.add('timestamp', isoformat(now())) m.add('timestamp', isoformat(now()))

View File

@ -4,9 +4,9 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: calibre 0.7.41\n" "Project-Id-Version: calibre 0.7.42\n"
"POT-Creation-Date: 2011-01-21 12:09+MST\n" "POT-Creation-Date: 2011-01-21 14:53+MST\n"
"PO-Revision-Date: 2011-01-21 12:09+MST\n" "PO-Revision-Date: 2011-01-21 14:53+MST\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: LANGUAGE\n" "Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -3155,7 +3155,7 @@ msgid "Copy to Clipboard"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:222 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:222
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:95 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:96
msgid "Copy" msgid "Copy"
msgstr "" msgstr ""
@ -4811,160 +4811,160 @@ msgstr ""
msgid "Tab template for catalog.ui" msgid "Tab template for catalog.ui"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:68 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:69
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:69 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:70
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:72 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:73
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:74 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:75
msgid "Strikethrough" msgid "Strikethrough"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:77
msgid "Superscript" msgid "Superscript"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:79
msgid "Subscript" msgid "Subscript"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:81
msgid "Ordered list" msgid "Ordered list"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:82 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:83
msgid "Unordered list" msgid "Unordered list"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:85 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:86
msgid "Align left" msgid "Align left"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:87 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:88
msgid "Align center" msgid "Align center"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:89 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:90
msgid "Align right" msgid "Align right"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:91 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:92
msgid "Align justified" msgid "Align justified"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:92 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:93
msgid "Undo" msgid "Undo"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:93 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:94
msgid "Redo" msgid "Redo"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:94 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:95
msgid "Remove formatting" msgid "Remove formatting"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:96 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:97
msgid "Paste" msgid "Paste"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:97 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:98
msgid "Cut" msgid "Cut"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:99 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:100
msgid "Increase Indentation" msgid "Increase Indentation"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:101 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:102
msgid "Decrease Indentation" msgid "Decrease Indentation"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:103 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:104
msgid "Select all" msgid "Select all"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:108 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:109
msgid "Foreground color" msgid "Foreground color"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:113 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:114
msgid "Background color" msgid "Background color"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:117 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:118
msgid "Style text block" msgid "Style text block"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:119 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:120
msgid "Style the selected text block" msgid "Style the selected text block"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:124 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:125
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:33 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:33
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:145 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:145
msgid "Normal" msgid "Normal"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:125
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:126 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:126
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:127 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:127
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:128
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:129 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:129
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:130 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:130
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:131
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:131 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:132
msgid "Pre-formatted" msgid "Pre-formatted"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:132 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:133
msgid "Blockquote" msgid "Blockquote"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:133 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:134
msgid "Address" msgid "Address"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:140 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:141
msgid "Insert link" msgid "Insert link"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:142 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:143
#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79
#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:84 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:84
msgid "Clear" msgid "Clear"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:160 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:161
msgid "Choose foreground color" msgid "Choose foreground color"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:166 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:167
msgid "Choose background color" msgid "Choose background color"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:172
msgid "Create link" msgid "Create link"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:172 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:173
msgid "Enter URL" msgid "Enter URL"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:516 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:522
msgid "Normal view" msgid "Normal view"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:517 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:523
msgid "HTML Source" msgid "HTML Source"
msgstr "" msgstr ""
@ -7053,13 +7053,14 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:504 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:504
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:465 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:465
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:186 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:380
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:509
msgid "&Basic metadata" msgid "&Basic metadata"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:505 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:505
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:466 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:466
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:193 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:387
msgid "&Custom metadata" msgid "&Custom metadata"
msgstr "" msgstr ""
@ -7189,18 +7190,18 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:122 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:122
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:343 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:249
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:350 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:256
msgid "Could not read cover" msgid "Could not read cover"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:344 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:250
msgid "Could not read cover from %s format" msgid "Could not read cover from %s format"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:351 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:257
msgid "The cover in the %s format is invalid" msgid "The cover in the %s format is invalid"
msgstr "" msgstr ""
@ -7314,7 +7315,7 @@ msgid " The red color warns that the current title sort does not match the curre
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:468 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:468
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:45 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:47
#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:102 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:102
#: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:221 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:221
#: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:384 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:384
@ -7323,13 +7324,13 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:471 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:471
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:479 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:479
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:439 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:347
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:443 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:351
msgid "Save changes and edit the metadata of %s" msgid "Save changes and edit the metadata of %s"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:476 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:476
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:42 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:44
#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:103 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:103
#: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:211 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:211
#: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:401 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:401
@ -7382,12 +7383,12 @@ msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:944 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:944
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:395 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:302
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:945 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:945
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:396 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:303
msgid "Could not open %s. Is it being used by another program?" msgid "Could not open %s. Is it being used by another program?"
msgstr "" msgstr ""
@ -7521,6 +7522,7 @@ msgid "Update metadata from the metadata in the selected format"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:464 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:464
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:568
msgid "&Comments" msgid "&Comments"
msgstr "" msgstr ""
@ -8958,19 +8960,32 @@ msgstr ""
msgid "Details" msgid "Details"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:64 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:66
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:302 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:208
msgid "Edit Metadata" msgid "Edit Metadata"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:232 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:426
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:587
msgid "Change cover" msgid "Change cover"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:280 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:474
msgid "Co&mments" msgid "Co&mments"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:496
msgid "&Metadata"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:501
msgid "&Cover and formats"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:556
msgid "C&ustom metadata"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:36 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:36
msgid "Restore settings to default values. You have to click Apply to actually save the default settings." msgid "Restore settings to default values. You have to click Apply to actually save the default settings."
msgstr "" msgstr ""