diff --git a/src/calibre/translations/ca.po b/src/calibre/translations/ca.po
index f721c9ce2d..fec01e221a 100644
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
@@ -11,13 +11,13 @@ msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-14 23:15+0000\n"
-"PO-Revision-Date: 2011-01-15 20:47+0000\n"
+"PO-Revision-Date: 2011-01-16 13:00+0000\n"
 "Last-Translator: FerranRius <frius64@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-01-17 04:46+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -11479,6 +11479,79 @@ msgid ""
 "        </p>\n"
 "        "
 msgstr ""
+"\n"
+"        <p>Aquí poden afegir i suprimir funcions per al processament de "
+"plantilles.\n"
+"        Una funció de plantilles s'escriu en python. Obté informació del "
+"llibre, la\n"
+"        processa d'alguna forma i s'obté una cadena com a resultat. Les "
+"funcions\n"
+"        que es defineixen aquí es poden utilitzar en plantilles igual que es "
+"pot fer\n"
+"        servir les funcions integrades. Les funcions s'han d'anomenar, "
+"<b>avaluar</b>\n"
+"        i han de tenir la signatura que es mostra a continuació.</p>\n"
+"        <p><code>evaluate(self, formatter, kwargs, mi, locals, your "
+"parameters)\n"
+"        &rarr; returning a unicode string</code></p>\n"
+"        <p>Els paràmetres de la funció «evaluate» són:\n"
+"        <ul>\n"
+"        <li><b>formatter</b>: la instància del formatador que s'utilitza per "
+"avaluar\n"
+"        la plantilla actual. Podeu utilitzar-ho per fer l'avaluació de la "
+"plantilla\n"
+"        recursiva.</li>\n"
+"        <li><b>kwargs</b>: un diccionari de metadades. Els valors dels camps "
+"estan\n"
+"        en aquest diccionari.\n"
+"        <li><b>mi</b>: instància de metadades. S'utilitza per obtenir "
+"informació\n"
+"        del camps. Aquest paràmetre pot ser «none» en alguns casos, com "
+"quan\n"
+"        s'avaluen plantilles que no són de llibres.</li>\n"
+"        <li><b>locals</b>: les variables locals que s'assignen pel programa "
+"de\n"
+"        plantilles actual.</li>\n"
+"        <li><b>your parameters</b>: Podeu subministrar un o més paràmetres "
+"formals.\n"
+"        El nombre ha de coincidir amb el quadre de recompte d'arguments, "
+"excepte si\n"
+"        el recompte d'arguments és -1 (nombre d'arguments variable). En "
+"aquest cas\n"
+"        el darrer argument ha de ser «*args». Cal almenys un argument, "
+"normalment és\n"
+"        el valor del camp en el qual s'opera. Fixeu-vos que si s'escriu en "
+"el mode\n"
+"        bàsic de plantilles l'usuari no proporciona aquest primer argument, "
+"el\n"
+"        proporciona el formatador.</li>\n"
+"        </ul></p>\n"
+"        <p>\n"
+"        L'exemple de funció següent comprova el valor del camp. Si el camp "
+"no està\n"
+"        buit, s'obté el valor del camp, en cas contrari s'obté la cadena "
+"«BUIT».\n"
+"        <pre>\n"
+"        name: si_buit\n"
+"        arg count: 1\n"
+"        doc: si_buit(val) -- s'obté el valor si no està buit, «BUIT» en cas "
+"contrari.\n"
+"        codi del programa:\n"
+"        def evaluate(self, formatter, kwargs, mi, locals, val):\n"
+"            if val:\n"
+"                return val\n"
+"            else:\n"
+"                return 'BUIT'</pre>\n"
+"        Es pot invocar aquesta funció en qualsevol dels tres modes de "
+"programació de\n"
+"        plantilles:\n"
+"        <ul>\n"
+"        <li>mode d'una sola funció: {tags:si_buit()}</li>\n"
+"        <li>mode de programació de plantilles: {tags:'si_buit($)'}</li>\n"
+"        <li>mode de programació general: program: "
+"si_buit(field('tags'))</li>\n"
+"        </p>\n"
+"        "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:137
diff --git a/src/calibre/translations/en_GB.po b/src/calibre/translations/en_GB.po
index 071d41ebd5..1a98656570 100644
--- a/src/calibre/translations/en_GB.po
+++ b/src/calibre/translations/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-14 23:15+0000\n"
-"PO-Revision-Date: 2011-01-11 03:50+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"PO-Revision-Date: 2011-01-16 11:15+0000\n"
+"Last-Translator: Vladimir Oka <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-16 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-17 04:47+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -394,7 +394,7 @@ msgstr "Change metadata fields before saving/sending"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:853
 msgid "Template Functions"
-msgstr ""
+msgstr "Template Functions"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:855
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:891
@@ -405,7 +405,7 @@ msgstr "Advanced"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:859
 msgid "Create your own template functions"
-msgstr ""
+msgstr "Create your own template functions"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:864
 msgid "Sharing books by email"
@@ -1242,6 +1242,7 @@ msgstr ""
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
+"Refresh separate covers when using automatic management (newer readers)"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
 msgid ""
@@ -1249,6 +1250,9 @@ msgid ""
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
+"Set this option to have separate book covers uploaded every time you connect "
+"your device. Unset this option if you have so many books on the reader that "
+"performance is unacceptable."
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
@@ -3677,11 +3681,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf2xml/delete_info.py:203
 msgid "No action in dictionary state is \"%s\" \n"
-msgstr ""
+msgstr "No action in dictionary state is \"%s\" \n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf2xml/hex_2_utf8.py:296
 msgid "error no state found in hex_2_utf8"
-msgstr ""
+msgstr "error no state found in hex_2_utf8"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:25
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:23
@@ -3755,6 +3759,14 @@ msgid ""
 "paragraph.* unformatted: Most lines have hard line breaks, few/no blank "
 "lines or indents."
 msgstr ""
+"Paragraph structure.\n"
+"choices are ['auto', 'block', 'single', 'print', 'unformatted']\n"
+"* auto: Try to auto detect paragraph type.\n"
+"* block: Treat a blank line as a paragraph break.\n"
+"* single: Assume every line is a paragraph.\n"
+"* print:  Assume every line starting with 2+ spaces or a tab starts a "
+"paragraph.* unformatted: Most lines have hard line breaks, few/no blank "
+"lines or indents."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:38
 msgid ""
@@ -3768,6 +3780,15 @@ msgid ""
 "* markdown: Processing using markdown formatting. To learn more about "
 "markdown see"
 msgstr ""
+"Formatting used within the document.* auto: Automatically decide which "
+"formatting processor to use.\n"
+"* none: Do not process the document formatting. Everything is a paragraph "
+"and no styling is applied.\n"
+"* heuristic: Process using heuristics to determine formatting such as "
+"chapter headings and italic text.\n"
+"* textile: Processing using textile formatting.\n"
+"* markdown: Processing using markdown formatting. To learn more about "
+"markdown see"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:48
 msgid ""
@@ -4192,6 +4213,8 @@ msgid ""
 "No books to catalog\n"
 "Check job details"
 msgstr ""
+"No books to catalogue\n"
+"Check job details"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:70
 msgid "Catalog generated."
@@ -4740,7 +4763,7 @@ msgstr "metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:102
 msgid "Downloading {0} for {1} book(s)"
-msgstr ""
+msgstr "Downloading {0} for {1} book(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:186
@@ -4844,11 +4867,11 @@ msgstr "Help"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:12
 msgid "Move to next match"
-msgstr ""
+msgstr "Move to next match"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13
 msgid "Move to next highlighted match"
-msgstr ""
+msgstr "Move to next highlighted match"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:340
@@ -4862,15 +4885,15 @@ msgstr "F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:25
 msgid "Move to previous item"
-msgstr ""
+msgstr "Move to previous item"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:26
 msgid "Move to previous highlighted item"
-msgstr ""
+msgstr "Move to previous highlighted item"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:26
 msgid "Shift+N"
-msgstr ""
+msgstr "Shift+N"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213
@@ -5598,7 +5621,7 @@ msgstr "Books by &Title"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:303
 msgid "Books by Author"
-msgstr ""
+msgstr "Books by Author"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:304
 msgid ""
@@ -5607,6 +5630,10 @@ msgid ""
 "excludes tags of the form [tag], \n"
 "e.g., [Project Gutenberg]</p>"
 msgstr ""
+"<p>Default pattern \n"
+"\\[.+\\]\n"
+"excludes tags of the form [tag], \n"
+"e.g., [Project Gutenberg]</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:308
 msgid "Excluded genres"
@@ -5632,6 +5659,8 @@ msgid ""
 "<p>Comma-separated list of tags to exclude.\n"
 "Default: ~,Catalog"
 msgstr ""
+"<p>Comma-separated list of tags to exclude.\n"
+"Default: ~,Catalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:315
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:320
@@ -5648,7 +5677,7 @@ msgstr "Exclusion pattern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:318
 msgid "Matching books will be displayed with a check mark"
-msgstr ""
+msgstr "Matching books will be displayed with a check mark"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:319
 msgid "Read books"
@@ -5672,7 +5701,7 @@ msgstr "&Wishlist tag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:325
 msgid "Books tagged as Wishlist items will be displayed with an X"
-msgstr ""
+msgstr "Books tagged as Wishlist items will be displayed with an X"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:326
 msgid "&Thumbnail width"
@@ -7538,7 +7567,7 @@ msgstr "Delete from device"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/drm_error_ui.py:54
 msgid "This book is DRMed"
-msgstr ""
+msgstr "This book is DRMed"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/drm_error_ui.py:55
 msgid ""
@@ -7546,6 +7575,9 @@ msgid ""
 "cannot read or convert this book in calibre, \n"
 "<a href=\"http://bugs.calibre-ebook.com/wiki/DRM\">click here</a>."
 msgstr ""
+"<p>This book is locked by <b>DRM</b>. To learn more about DRM and why you "
+"cannot read or convert this book in calibre, \n"
+"<a href=\"http://bugs.calibre-ebook.com/wiki/DRM\">click here</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:35
 msgid "Author sort"
@@ -8350,13 +8382,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:794
 msgid "Timed out"
-msgstr ""
+msgstr "Timed out"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:795
 msgid ""
 "The download of social metadata timed out, the servers are probably busy. "
 "Try again later."
 msgstr ""
+"The download of social metadata timed out, the servers are probably busy. "
+"Try again later."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:802
 msgid "There were errors"
@@ -9185,7 +9219,7 @@ msgstr "A custom recipe named %s already exists. Do you want to replace it?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:274
 msgid "Choose builtin recipe"
-msgstr ""
+msgstr "Choose builtin recipe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:320
 msgid "Choose a recipe file"
@@ -9640,13 +9674,15 @@ msgstr "Reset Quick Search"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:198
 msgid "&Highlight"
-msgstr ""
+msgstr "&Highlight"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:199
 msgid ""
 "When searching, highlight matched books, instead of restricting the book "
 "list to the matches.<p> You can use the N or F3 keys to go to the next match."
 msgstr ""
+"When searching, highlight matched books, instead of restricting the book "
+"list to the matches.<p> You can use the N or F3 keys to go to the next match."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:215
 msgid "Copy current search text (instead of search name)"
@@ -9856,6 +9892,8 @@ msgid ""
 "Ignore custom plugins, useful if you installed a plugin that is preventing "
 "calibre from starting"
 msgstr ""
+"Ignore custom plugins, useful if you installed a plugin that is preventing "
+"calibre from starting"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
@@ -10728,7 +10766,7 @@ msgstr "&Install command line tools"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:31
 msgid "Open Editor"
-msgstr ""
+msgstr "Open Editor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:65
 msgid "Device currently connected: "
@@ -10844,7 +10882,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:162
 msgid "Add plugin"
-msgstr ""
+msgstr "Add plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:170
 msgid ""
@@ -10852,17 +10890,22 @@ msgid ""
 "virus/malware. Only install it if you got it from a trusted source. Are you "
 "sure you want to proceed?"
 msgstr ""
+"Installing plugins is a <b>security risk</b>. Plugins can contain a "
+"virus/malware. Only install it if you got it from a trusted source. Are you "
+"sure you want to proceed?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:225
 msgid "Success"
-msgstr ""
+msgstr "Success"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:181
 msgid ""
 "Plugin <b>{0}</b> successfully installed under <b> {1} plugins</b>. You may "
 "have to restart calibre for the plugin to take effect."
 msgstr ""
+"Plugin <b>{0}</b> successfully installed under <b> {1} plugins</b>. You may "
+"have to restart calibre for the plugin to take effect."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:192
 msgid "No valid plugin path"
@@ -10890,7 +10933,7 @@ msgstr "Plugin: %s does not need customization"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:220
 msgid "Plugin {0} successfully removed"
-msgstr ""
+msgstr "Plugin {0} successfully removed"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:228
 msgid "Cannot remove builtin plugin"
@@ -10923,7 +10966,7 @@ msgstr "&Remove plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:63
 msgid "&Add a new plugin"
-msgstr ""
+msgstr "&Add a new plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:33
 msgid "Any custom field"
@@ -11236,6 +11279,70 @@ msgid ""
 "        </p>\n"
 "        "
 msgstr ""
+"\n"
+"        <p>Here you can add and remove functions used in template "
+"processing. A\n"
+"        template function is written in python. It takes information from "
+"the\n"
+"        book, processes it in some way, then returns a string result. "
+"Functions\n"
+"        defined here are usable in templates in the same way that builtin\n"
+"        functions are usable. The function must be named <b>evaluate</b>, "
+"and\n"
+"        must have the signature shown below.</p>\n"
+"        <p><code>evaluate(self, formatter, kwargs, mi, locals, your "
+"parameters)\n"
+"        &rarr; returning a unicode string</code></p>\n"
+"        <p>The parameters of the evaluate function are:\n"
+"        <ul>\n"
+"        <li><b>formatter</b>: the instance of the formatter being used to\n"
+"        evaluate the current template. You can use this to do recursive\n"
+"        template evaluation.</li>\n"
+"        <li><b>kwargs</b>: a dictionary of metadata. Field values are in "
+"this\n"
+"        dictionary.\n"
+"        <li><b>mi</b>: a Metadata instance. Used to get field information.\n"
+"        This parameter can be None in some cases, such as when evaluating\n"
+"        non-book templates.</li>\n"
+"        <li><b>locals</b>: the local variables assigned to by the current\n"
+"        template program.</li>\n"
+"        <li><b>your parameters</b>: You must supply one or more formal\n"
+"        parameters. The number must match the arg count box, unless arg "
+"count is\n"
+"        -1 (variable number or arguments), in which case the last argument "
+"must\n"
+"        be *args. At least one argument is required, and is usually the "
+"value of\n"
+"        the field being operated upon. Note that when writing in basic "
+"template\n"
+"        mode, the user does not provide this first argument. Instead it is\n"
+"        supplied by the formatter.</li>\n"
+"        </ul></p>\n"
+"        <p>\n"
+"        The following example function checks the value of the field. If "
+"the\n"
+"        field is not empty, the field's value is returned, otherwise the "
+"value\n"
+"        EMPTY is returned.\n"
+"        <pre>\n"
+"        name: my_ifempty\n"
+"        arg count: 1\n"
+"        doc: my_ifempty(val) -- return val if it is not empty, otherwise the "
+"string 'EMPTY'\n"
+"        program code:\n"
+"        def evaluate(self, formatter, kwargs, mi, locals, val):\n"
+"            if val:\n"
+"                return val\n"
+"            else:\n"
+"                return 'EMPTY'</pre>\n"
+"        This function can be called in any of the three template program "
+"modes:\n"
+"        <ul>\n"
+"        <li>single-function mode: {tags:my_ifempty()}</li>\n"
+"        <li>template program mode: {tags:'my_ifempty($)'}</li>\n"
+"        <li>general program mode: program: my_ifempty(field('tags'))</li>\n"
+"        </p>\n"
+"        "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:137
@@ -11243,63 +11350,63 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:148
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:159
 msgid "Template functions"
-msgstr ""
+msgstr "Template functions"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:128
 msgid "You cannot delete a built-in function"
-msgstr ""
+msgstr "You cannot delete a built-in function"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:138
 msgid "Function not defined"
-msgstr ""
+msgstr "Function not defined"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:145
 msgid "Name already used"
-msgstr ""
+msgstr "Name already used"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:149
 msgid "Argument count must be -1 or greater than zero"
-msgstr ""
+msgstr "Argument count must be -1 or greater than zero"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:160
 msgid "Exception while compiling function"
-msgstr ""
+msgstr "Exception while compiling function"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:96
 msgid "&Function:"
-msgstr ""
+msgstr "&Function:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:97
 msgid "Enter the name of the function to create."
-msgstr ""
+msgstr "Enter the name of the function to create."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:98
 msgid "Arg &count:"
-msgstr ""
+msgstr "Arg &count:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:99
 msgid "Set this to -1 if the function takes a variable number of arguments"
-msgstr ""
+msgstr "Set this to -1 if the function takes a variable number of arguments"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:100
 msgid "&Documentation:"
-msgstr ""
+msgstr "&Documentation:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:102
 msgid "&Delete"
-msgstr ""
+msgstr "&Delete"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:103
 msgid "&Replace"
-msgstr ""
+msgstr "&Replace"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:104
 msgid "C&reate"
-msgstr ""
+msgstr "C&reate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:105
 msgid "&Program Code: (be sure to follow python indenting rules)"
-msgstr ""
+msgstr "&Program Code: (be sure to follow python indenting rules)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:36
 msgid "Switch between library and device views"
@@ -12040,13 +12147,15 @@ msgstr "The standard font type"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:125
 msgid "Still editing"
-msgstr ""
+msgstr "Still editing"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:126
 msgid ""
 "You are in the middle of editing a keyboard shortcut first complete that, by "
 "clicking outside the  shortcut editing box."
 msgstr ""
+"You are in the middle of editing a keyboard shortcut first complete that, by "
+"clicking outside the  shortcut editing box."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:514
 msgid "&Lookup in dictionary"
@@ -12509,12 +12618,13 @@ msgstr "Mail successfully sent"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:95
 msgid "OK to proceed?"
-msgstr ""
+msgstr "OK to proceed?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:96
 msgid ""
 "This will display your email password on the screen. Is it OK to proceed?"
 msgstr ""
+"This will display your email password on the screen. Is it OK to proceed?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:139
 msgid ""
@@ -12909,6 +13019,10 @@ msgid ""
 "this'.Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Comma-separated list of tag words indicating book should be excluded from "
+"output.For example: 'skip' will match 'skip this book' and 'Skip will like "
+"this'.Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:610
 msgid ""
@@ -12916,6 +13030,9 @@ msgid ""
 "Author section is always generated.Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Include 'Authors' section in catalogue.This switch is ignored - Books By "
+"Author section is always generated.Default: '%default'\n"
+"Applies to: ePub, MOBI output formats"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:618
 msgid ""
@@ -13053,6 +13170,15 @@ msgid ""
 "then rebuild the catalog.\n"
 "*** Terminating catalog generation ***\n"
 msgstr ""
+"\n"
+"\n"
+"*** Metadata error ***\n"
+"Inconsistent Author Sort values for Author '{0}', unable to continue "
+"building catalogue.\n"
+"Select all books by '{0}', apply correct Author Sort value in Edit Metadata "
+"dialog,\n"
+"then rebuild the catalogue.\n"
+"*** Terminating catalogue generation ***\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:26
 msgid "Invalid titles"
@@ -13693,7 +13819,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:989
 msgid "You must provide the %s option to do a recovery"
-msgstr ""
+msgstr "You must provide the %s option to do a recovery"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1026
 msgid ""
@@ -14310,7 +14436,7 @@ msgstr " near "
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:38
 msgid "end of program"
-msgstr ""
+msgstr "end of program"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:75
 msgid "syntax error - program ends before EOF"
@@ -14346,49 +14472,63 @@ msgstr "No such variable "
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:57
 msgid "No documentation provided"
-msgstr ""
+msgstr "No documentation provided"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:95
 msgid ""
 "strcmp(x, y, lt, eq, gt) -- does a case-insensitive comparison of x and y as "
 "strings. Returns lt if x < y. Returns eq if x == y. Otherwise returns gt."
 msgstr ""
+"strcmp(x, y, lt, eq, gt) -- does a case-insensitive comparison of x and y as "
+"strings. Returns lt if x < y. Returns eq if x == y. Otherwise returns gt."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:110
 msgid ""
 "cmp(x, y, lt, eq, gt) -- compares x and y after converting both to numbers. "
 "Returns lt if x < y. Returns eq if x == y. Otherwise returns gt."
 msgstr ""
+"cmp(x, y, lt, eq, gt) -- compares x and y after converting both to numbers. "
+"Returns lt if x < y. Returns eq if x == y. Otherwise returns gt."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:125
 msgid ""
 "strcat(a, b, ...) -- can take any number of arguments. Returns a string "
 "formed by concatenating all the arguments"
 msgstr ""
+"strcat(a, b, ...) -- can take any number of arguments. Returns a string "
+"formed by concatenating all the arguments"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:138
 msgid ""
 "add(x, y) -- returns x + y. Throws an exception if either x or y are not "
 "numbers."
 msgstr ""
+"add(x, y) -- returns x + y. Throws an exception if either x or y are not "
+"numbers."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:148
 msgid ""
 "subtract(x, y) -- returns x - y. Throws an exception if either x or y are "
 "not numbers."
 msgstr ""
+"subtract(x, y) -- returns x - y. Throws an exception if either x or y are "
+"not numbers."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:158
 msgid ""
 "multiply(x, y) -- returns x * y. Throws an exception if either x or y are "
 "not numbers."
 msgstr ""
+"multiply(x, y) -- returns x * y. Throws an exception if either x or y are "
+"not numbers."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:168
 msgid ""
 "divide(x, y) -- returns x / y. Throws an exception if either x or y are not "
 "numbers."
 msgstr ""
+"divide(x, y) -- returns x / y. Throws an exception if either x or y are not "
+"numbers."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:178
 msgid ""
@@ -14399,6 +14539,12 @@ msgid ""
 "automatically. For example, template('[[title_sort]]') will evaluate the "
 "template {title_sort} and return its value."
 msgstr ""
+"template(x) -- evaluates x as a template. The evaluation is done in its own "
+"context, meaning that variables are not shared between the caller and the "
+"template evaluation. Because the { and } characters are special, you must "
+"use [[ for the { character and ]] for the } character; they are converted "
+"automatically. For example, template('[[title_sort]]') will evaluate the "
+"template {title_sort} and return its value."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:193
 msgid ""
@@ -14406,12 +14552,17 @@ msgid ""
 "'assign'ed to) instead of the book metadata.  This permits using the "
 "template processor to construct complex results from local variables."
 msgstr ""
+"eval(template) -- evaluates the template, passing the local variables (those "
+"'assign'ed to) instead of the book metadata.  This permits using the "
+"template processor to construct complex results from local variables."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:206
 msgid ""
 "assign(id, val) -- assigns val to id, then returns val. id must be an "
 "identifier, not an expression"
 msgstr ""
+"assign(id, val) -- assigns val to id, then returns val. id must be an "
+"identifier, not an expression"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:216
 msgid ""
@@ -14419,10 +14570,13 @@ msgid ""
 "start calibre from the command line (calibre-debug -g), the output will go "
 "to a black hole."
 msgstr ""
+"print(a, b, ...) -- prints the arguments to standard output. Unless you "
+"start calibre from the command line (calibre-debug -g), the output will go "
+"to a black hole."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:227
 msgid "field(name) -- returns the metadata field named by name"
-msgstr ""
+msgstr "field(name) -- returns the metadata field named by name"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:235
 msgid ""
@@ -14433,6 +14587,12 @@ msgid ""
 "substr('12345', 1, 0) returns '2345', and substr('12345', 1, -1) returns "
 "'234'."
 msgstr ""
+"substr(str, start, end) -- returns the start'th through the end'th "
+"characters of str. The first character in str is the zero'th character. If "
+"end is negative, then it indicates that many characters counting from the "
+"right. If end is zero, then it indicates the last character. For example, "
+"substr('12345', 1, 0) returns '2345', and substr('12345', 1, -1) returns "
+"'234'."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:248
 msgid ""
@@ -14443,6 +14603,12 @@ msgid ""
 "the value of some other composite field. This is extremely useful when "
 "constructing variable save paths"
 msgstr ""
+"lookup(val, pattern, field, pattern, field, ..., else_field) -- like switch, "
+"except the arguments are field (metadata) names, not text. The value of the "
+"appropriate field will be fetched and used. Note that because composite "
+"columns are fields, you can use this function in one composite field to use "
+"the value of some other composite field. This is extremely useful when "
+"constructing variable save paths"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:263
 msgid "lookup requires either 2 or an odd number of arguments"
@@ -14453,6 +14619,8 @@ msgid ""
 "test(val, text if not empty, text if empty) -- return `text if not empty` if "
 "the field is not empty, otherwise return `text if empty`"
 msgstr ""
+"test(val, text if not empty, text if empty) -- return `text if not empty` if "
+"the field is not empty, otherwise return `text if empty`"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:287
 msgid ""
@@ -14460,6 +14628,9 @@ msgid ""
 "contains matches for the regular expression `pattern`. Returns `text if "
 "match` if matches are found, otherwise it returns `text if no match`"
 msgstr ""
+"contains(val, pattern, text if match, text if not match) -- checks if field "
+"contains matches for the regular expression `pattern`. Returns `text if "
+"match` if matches are found, otherwise it returns `text if no match`"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:302
 msgid ""
@@ -14469,6 +14640,11 @@ msgid ""
 "else_value is returned. You can have as many `pattern, value` pairs as you "
 "want"
 msgstr ""
+"switch(val, pattern, value, pattern, value, ..., else_value) -- for each "
+"`pattern, value` pair, checks if the field matches the regular expression "
+"`pattern` and if so, returns that `value`. If no pattern matches, then "
+"else_value is returned. You can have as many `pattern, value` pairs as you "
+"want"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:310
 msgid "switch requires an odd number of arguments"
@@ -14480,12 +14656,17 @@ msgid ""
 "expression. All instances of `pattern` are replaced with `replacement`. As "
 "in all of calibre, these are python-compatible regular expressions"
 msgstr ""
+"re(val, pattern, replacement) -- return the field after applying the regular "
+"expression. All instances of `pattern` are replaced with `replacement`. As "
+"in all of calibre, these are python-compatible regular expressions"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:333
 msgid ""
 "ifempty(val, text if empty) -- return val if val is not empty, otherwise "
 "return `text if empty`"
 msgstr ""
+"ifempty(val, text if empty) -- return val if val is not empty, otherwise "
+"return `text if empty`"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:345
 msgid ""
@@ -14500,6 +14681,16 @@ msgid ""
 "chars + the length of `middle text`, then the field will be used intact. For "
 "example, the title `The Dome` would not be changed."
 msgstr ""
+"shorten(val, left chars, middle text, right chars) -- Return a shortened "
+"version of the field, consisting of `left chars` characters from the "
+"beginning of the field, followed by `middle text`, followed by `right chars` "
+"characters from the end of the string. `Left chars` and `right chars` must "
+"be integers. For example, assume the title of the book is `Ancient English "
+"Laws in the Times of Ivanhoe`, and you want it to fit in a space of at most "
+"15 characters. If you use {title:shorten(9,-,5)}, the result will be "
+"`Ancient E-nhoe`. If the field's length is less than left chars + right "
+"chars + the length of `middle text`, then the field will be used intact. For "
+"example, the title `The Dome` would not be changed."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:370
 msgid ""
@@ -14508,6 +14699,10 @@ msgid ""
 "comma as the separator, but authors uses an ampersand. Examples: "
 "{tags:count(,)}, {authors:count(&)}"
 msgstr ""
+"count(val, separator) -- interprets the value as a list of items separated "
+"by `separator`, returning the number of items in the list. Most lists use a "
+"comma as the separator, but authors uses an ampersand. Examples: "
+"{tags:count(,)}, {authors:count(&)}"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:381
 msgid ""
@@ -14517,22 +14712,27 @@ msgid ""
 "If the item is not in the list, then the empty value is returned. The "
 "separator has the same meaning as in the count function."
 msgstr ""
+"list_item(val, index, separator) -- interpret the value as a list of items "
+"separated by `separator`, returning the `index`th item. The first item is "
+"number zero. The last item can be returned using `list_item(-1,separator)`. "
+"If the item is not in the list, then the empty value is returned. The "
+"separator has the same meaning as in the count function."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:401
 msgid "uppercase(val) -- return value of the field in upper case"
-msgstr ""
+msgstr "uppercase(val) -- return value of the field in upper case"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:409
 msgid "lowercase(val) -- return value of the field in lower case"
-msgstr ""
+msgstr "lowercase(val) -- return value of the field in lower case"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:417
 msgid "titlecase(val) -- return value of the field in title case"
-msgstr ""
+msgstr "titlecase(val) -- return value of the field in title case"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:425
 msgid "capitalize(val) -- return value of the field capitalized"
-msgstr ""
+msgstr "capitalize(val) -- return value of the field capitalized"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -14956,6 +15156,10 @@ msgid ""
 "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 ""
+"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."
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid "Do not download CSS stylesheets."
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index 707c8aa07b..0441c1b576 100644
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-14 23:15+0000\n"
-"PO-Revision-Date: 2011-01-15 15:31+0000\n"
-"Last-Translator: Vincent C. <Unknown>\n"
+"PO-Revision-Date: 2011-01-16 10:03+0000\n"
+"Last-Translator: sengian <Unknown>\n"
 "Language-Team: Français <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-16 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-01-17 04:47+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 "X-Poedit-Bookmarks: 1177,1104,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -15139,7 +15139,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
 msgid "Download finished"
-msgstr "Téléchargement effectué"
+msgstr "Téléchargement terminé"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
 msgid "Failed to download the following articles:"
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index af10e19a00..9568e204a0 100644
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-14 23:15+0000\n"
-"PO-Revision-Date: 2011-01-11 00:19+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"PO-Revision-Date: 2011-01-16 06:56+0000\n"
+"Last-Translator: MeltingShell <Unknown>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-16 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-17 04:47+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,1105,-1,1312,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -4816,7 +4816,7 @@ msgstr "metadati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:102
 msgid "Downloading {0} for {1} book(s)"
-msgstr ""
+msgstr "Scaricamento {0} per {1} libri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:186
@@ -4903,11 +4903,11 @@ msgstr "Aiuto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:12
 msgid "Move to next match"
-msgstr ""
+msgstr "Prossima corrispondenza"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13
 msgid "Move to next highlighted match"
-msgstr ""
+msgstr "Prossima corrispondenza evidenziata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:340
@@ -4921,15 +4921,15 @@ msgstr "F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:25
 msgid "Move to previous item"
-msgstr ""
+msgstr "All'elemento precedente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:26
 msgid "Move to previous highlighted item"
-msgstr ""
+msgstr "All'elemento selezionato precedente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:26
 msgid "Shift+N"
-msgstr ""
+msgstr "Shift+N"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213
@@ -5659,7 +5659,7 @@ msgstr "Libri per &titolo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:303
 msgid "Books by Author"
-msgstr ""
+msgstr "Libri per autore"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:304
 msgid ""
@@ -8127,7 +8127,7 @@ msgstr "&Modello:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:456
 msgid "Enter a template to be used as the source for the search/replace"
-msgstr ""
+msgstr "Inserisci un modello da usare come fonte per cerca/sostituisci"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:457
 msgid "&Search for:"
@@ -8177,6 +8177,9 @@ msgid ""
 "field is processed. In regular expression mode, only the matched text is "
 "processed"
 msgstr ""
+"Specifica come il testo deve essere elaborato dopo il cerca e sostituisci. "
+"Nel modo carattere, l'intero campo viene elaborato. Nel modo espressioni "
+"regolari, solo il testo che corrisponde viene elaborato."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:466
 msgid "&Destination field:"
@@ -8418,7 +8421,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:794
 msgid "Timed out"
-msgstr ""
+msgstr "Scaduto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:795
 msgid ""
@@ -8859,7 +8862,7 @@ msgstr "Ricerca avanzata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:199
 msgid "&What kind of match to use:"
-msgstr ""
+msgstr "&Che tipo di corrispondenza da usare:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:200
 msgid "Contains: the word or phrase matches anywhere in the metadata field"
@@ -9707,7 +9710,7 @@ msgstr "Resetta ricerca veloce"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:198
 msgid "&Highlight"
-msgstr ""
+msgstr "&Evidenzia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:199
 msgid ""
@@ -9733,7 +9736,7 @@ msgstr "S"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:375
 msgid "Edit template"
-msgstr ""
+msgstr "Modifica modello"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -10329,7 +10332,7 @@ msgstr "Colonna testuale per mantenere informazioni sulle serie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:31
 msgid "Text, but with a fixed set of permitted values"
-msgstr ""
+msgstr "Testo, ma con una lista fissa di valori permessi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:35
 msgid "Floating point numbers"
@@ -10608,11 +10611,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
-msgstr ""
+msgstr "Disabilitato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
-msgstr ""
+msgstr "Partizionato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
@@ -10795,7 +10798,7 @@ msgstr "&Installa gli strumenti per i comandi di linea"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:31
 msgid "Open Editor"
-msgstr ""
+msgstr "Apri editor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:65
 msgid "Device currently connected: "
@@ -10893,7 +10896,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:162
 msgid "Add plugin"
-msgstr ""
+msgstr "Aggiungi plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:170
 msgid ""
@@ -10905,13 +10908,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:225
 msgid "Success"
-msgstr ""
+msgstr "Riuscito"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:181
 msgid ""
 "Plugin <b>{0}</b> successfully installed under <b> {1} plugins</b>. You may "
 "have to restart calibre for the plugin to take effect."
 msgstr ""
+"Plugin <b>{0}</b> installato correttamente in <b> {1} plugins</b>. È "
+"necessario riavviare calibre per poter utilizzare il plugin."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:192
 msgid "No valid plugin path"
@@ -10939,7 +10944,7 @@ msgstr "Plugin: %s non richiede personalizzazione"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:220
 msgid "Plugin {0} successfully removed"
-msgstr ""
+msgstr "Plugin {0} rimosso con successo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:228
 msgid "Cannot remove builtin plugin"
@@ -10973,7 +10978,7 @@ msgstr "&Rimuovi il plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:63
 msgid "&Add a new plugin"
-msgstr ""
+msgstr "&Aggiungi un nuovo plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:33
 msgid "Any custom field"
@@ -11307,7 +11312,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:145
 msgid "Name already used"
-msgstr ""
+msgstr "Nome già utilizzato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:149
 msgid "Argument count must be -1 or greater than zero"
@@ -11339,15 +11344,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:102
 msgid "&Delete"
-msgstr ""
+msgstr "&Elimina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:103
 msgid "&Replace"
-msgstr ""
+msgstr "S&ostituisci"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:104
 msgid "C&reate"
-msgstr ""
+msgstr "C&rea"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:105
 msgid "&Program Code: (be sure to follow python indenting rules)"
@@ -11617,7 +11622,7 @@ msgstr "Il nome della ricerca salvata %s è già in uso."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1223
 msgid "Find item in tag browser"
-msgstr ""
+msgstr "Cerca elemento nel browser dei tag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1226
 msgid ""
@@ -11631,11 +11636,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1235
 msgid "ALT+f"
-msgstr ""
+msgstr "ALT+f"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1239
 msgid "F&ind"
-msgstr ""
+msgstr "&Cerca"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1240
 msgid "Find the first/next matching item"
@@ -11643,7 +11648,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1247
 msgid "Collapse all categories"
-msgstr ""
+msgstr "Contrai tutte le categorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1268
 msgid "No More Matches.</b><p> Click Find again to go to first match"
@@ -11752,7 +11757,7 @@ msgstr "Guida rapida di Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:291
 msgid "Debug mode"
-msgstr ""
+msgstr "Modalità debug"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:292
 msgid ""
@@ -11971,11 +11976,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:198
 msgid "disabled"
-msgstr ""
+msgstr "disabilitato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:199
 msgid " secs"
-msgstr ""
+msgstr " sec"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:200
 msgid "Mouse &wheel flips pages"
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index 48c941af92..e38c777ff5 100644
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-14 23:15+0000\n"
-"PO-Revision-Date: 2011-01-10 17:08+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"PO-Revision-Date: 2011-01-16 19:49+0000\n"
+"Last-Translator: Oscar Schrover <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-16 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-01-17 04:46+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-Language: Dutch\n"
@@ -25,7 +25,7 @@ msgstr "Stel metagegevens van %s bestanden in"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
-msgstr "Doet helemaal niets"
+msgstr "Geen respons"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
@@ -173,11 +173,11 @@ msgstr "Basis"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:130
 msgid "Customize"
-msgstr "Aanpassen"
+msgstr "Wijzigen"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:294
 msgid "File type"
-msgstr "Bestandstype"
+msgstr "Bestandssoort"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:330
 msgid "Metadata reader"
@@ -193,7 +193,7 @@ msgstr "Catalogus generator"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:499
 msgid "User Interface Action"
-msgstr "Actie gebruikers interface"
+msgstr "Gebruiker werkt met interface"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:525
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
@@ -257,7 +257,7 @@ msgstr "Haal de omslag uit bestanden met stripverhalen"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:311
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from %s files"
-msgstr "lees de metagegevens uit %s bestanden"
+msgstr "lees de metagegevens van %s bestanden"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
@@ -278,7 +278,7 @@ msgstr "Stel metagegevens van %s bestanden in"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:727
 msgid "Look and Feel"
-msgstr "Uiterlijk en Vormgeving"
+msgstr "Uiterlijk en bedieningsgemak"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:729
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:741
@@ -290,7 +290,8 @@ msgstr "Interface"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:733
 msgid "Adjust the look and feel of the calibre interface to suit your tastes"
 msgstr ""
-"Pas het uiterlijk en gedrag van de calibre interface aan naar je smaak"
+"Pas op basis van je voorkeuren het uiterlijk en de vorm van de calibre "
+"interface aan."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:739
 msgid "Behavior"
@@ -298,7 +299,7 @@ msgstr "Gedrag"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:745
 msgid "Change the way calibre behaves"
-msgstr "Verander de manier waarop calibre zich gedraagt"
+msgstr "Wijzig de manier waarop Calibre reageert"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:750
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:217
@@ -311,7 +312,7 @@ msgstr "Voeg/Verwijder je eigen kolommen toe aan de calibre boekenlijst"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:761
 msgid "Customize the toolbar"
-msgstr "Werkbalk aanpassen"
+msgstr "Gereedschapsbalk aanpassen"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:767
 msgid ""
@@ -386,7 +387,7 @@ msgstr "Stuur boeken naar apparaten"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:836
 msgid "Control how calibre transfers files to your ebook reader"
-msgstr "Bepaal hoe calibre bestanden naar je ebook reader overplaats"
+msgstr "Bepaald hoe calibre de bestanden naar je ebook reader verstuurt"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:842
 msgid "Metadata plugboards"
@@ -398,7 +399,7 @@ msgstr "Verander velden met metagegevens voor het opslaan/versturen"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:853
 msgid "Template Functions"
-msgstr ""
+msgstr "Eigenschappen sjabloon"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:855
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:891
@@ -409,7 +410,7 @@ msgstr "Geavanceerd"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:859
 msgid "Create your own template functions"
-msgstr ""
+msgstr "Bepaal de eigenschappen van je sjabloon"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:864
 msgid "Sharing books by email"
@@ -448,8 +449,7 @@ msgstr "Plugins"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:895
 msgid "Add/remove/customize various bits of calibre functionality"
 msgstr ""
-"Voeg toe/verwijder/customize de verschillende delen van de calibre "
-"functionaliteit"
+"Voeg toe/verwijder/of pas diverse onderdelen van calibre's werking  aan"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:901
 msgid "Tweaks"
@@ -833,7 +833,7 @@ msgstr "Communiceer met de Sanda Bambook eBook reader"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:25
 msgid "Li Fanxi"
-msgstr ""
+msgstr "Li Fanxi"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:41
 msgid "Device IP Address (restart calibre after changing)"
@@ -1246,11 +1246,19 @@ msgid ""
 "WARNING: This option should only be used with newer SONY readers: 350, 650, "
 "950 and newer."
 msgstr ""
+"Normaliter ziet de gebruiker van de Sony reader een weergave van de "
+"afbeelding van de omslag. Met deze optie, zal calibre een afzonderlijke "
+"omslag naar de reader sturen, wat van pas komt wanneer je DRMED boeken "
+"overzet waarvan je niet de omslag wijzigen kunt. Waarschuwing:  Deze optie "
+"kan slechts gebruikt worden bij de nieuwste Sony readers: 350, 650, 950 en "
+"nieuwer"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
+"Ververs afzonderlijke omslagen wanneer automatisch management wordt gebruikt "
+"(nieuwste readers)"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
 msgid ""
@@ -1258,6 +1266,9 @@ msgid ""
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
+"Stel deze optie in waneer afzonderlijke boekomslagen wordt opgeladen telkens "
+"wanneer U contact maakt met Uw apparaat. Schakel deze optie uit wanneer door "
+"een groot aantal boeken op uw reader de prestaties sterk teruglopen."
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
diff --git a/src/calibre/translations/zh_TW.po b/src/calibre/translations/zh_TW.po
index 2910176623..de9da2e8c9 100644
--- a/src/calibre/translations/zh_TW.po
+++ b/src/calibre/translations/zh_TW.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-14 23:15+0000\n"
-"PO-Revision-Date: 2011-01-16 00:18+0000\n"
+"PO-Revision-Date: 2011-01-16 10:55+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-16 05:00+0000\n"
+"X-Launchpad-Export-Date: 2011-01-17 04:47+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 "Language: zh_TW\n"
 
@@ -220,6 +220,8 @@ msgid ""
 "directory pmlname_img or images. This plugin is run every time you add a PML "
 "file to the library."
 msgstr ""
+"建立 PMLZ 壓縮檔，在 pmlname_img 或 images 目錄中包含 PML 檔案和所有的圖片。這個外掛程式會在您每次將 PML "
+"檔案加入書庫時執行。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:92
 msgid "Extract cover from comic files"
@@ -281,7 +283,7 @@ msgstr "介面"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:733
 msgid "Adjust the look and feel of the calibre interface to suit your tastes"
-msgstr ""
+msgstr "調整 calibre 介面的外觀和感覺以符合您的喜好"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:739
 msgid "Behavior"
@@ -289,7 +291,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:745
 msgid "Change the way calibre behaves"
-msgstr ""
+msgstr "改變 calibre 的行為"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:750
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:217
@@ -298,7 +300,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:756
 msgid "Add/remove your own columns to the calibre book list"
-msgstr ""
+msgstr "在 calibre 書籍清單中加入/移除您自己的欄位"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:761
 msgid "Customize the toolbar"
@@ -308,7 +310,7 @@ msgstr ""
 msgid ""
 "Customize the toolbars and context menus, changing which actions are "
 "available in each"
-msgstr ""
+msgstr "自訂工具列和關聯選單，改變每次可用的動作"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:773
 msgid "Input Options"
@@ -322,7 +324,7 @@ msgstr "轉換"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:779
 msgid "Set conversion options specific to each input format"
-msgstr ""
+msgstr "設定每個輸入格式指定的轉換選項"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:784
 msgid "Common Options"
@@ -330,7 +332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:790
 msgid "Set conversion options common to all formats"
-msgstr ""
+msgstr "設定所有格式的轉換選項指令"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:795
 msgid "Output Options"
@@ -338,7 +340,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:801
 msgid "Set conversion options specific to each output format"
-msgstr ""
+msgstr "設定每個輸出格式指定的轉換選項"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:806
 msgid "Adding books"
@@ -363,7 +365,7 @@ msgstr "將書籍儲存至磁碟"
 msgid ""
 "Control how calibre exports files from its database to disk when using Save "
 "to disk"
-msgstr ""
+msgstr "控制當使用儲存至磁碟時 calibre 要如何從資料庫中匯出檔案到磁碟"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:830
 msgid "Sending books to devices"
@@ -371,7 +373,7 @@ msgstr "將書籍傳送至裝置"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:836
 msgid "Control how calibre transfers files to your ebook reader"
-msgstr ""
+msgstr "控制 calibre 要如何傳輸檔案到您的電子書閱讀器"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:842
 msgid "Metadata plugboards"
@@ -379,7 +381,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:848
 msgid "Change metadata fields before saving/sending"
-msgstr ""
+msgstr "在儲存/傳送前改變元數據欄位"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:853
 msgid "Template Functions"
@@ -419,7 +421,7 @@ msgstr ""
 msgid ""
 "Setup the calibre Content Server which will give you access to your calibre "
 "library from anywhere, on any device, over the internet"
-msgstr ""
+msgstr "設定 calibre 內容伺服器可以讓您在任何地方，使用任何裝置透過網際網路存取您的 calibre 書庫"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:889
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:163
@@ -432,11 +434,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:901
 msgid "Tweaks"
-msgstr ""
+msgstr "調整"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:907
 msgid "Fine tune how calibre behaves in various contexts"
-msgstr ""
+msgstr "詳細校調 calibre 在各種狀況的行為"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:912
 msgid "Miscellaneous"
@@ -482,7 +484,7 @@ msgstr "如果您不瞭解輸入文件的詳情請使用本預設的配置文件
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:453
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
-msgstr "這個設定檔是用於 SONY PRS 產品線。即 500/505/600/700 等。"
+msgstr "這個設定檔適用於 SONY PRS 產品線。即 500/505/600/700 等。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:73
 msgid "This profile is intended for the SONY PRS 300."
@@ -562,17 +564,17 @@ msgstr "若您希望在電腦和設備上閱讀文檔，請使用這個預設的
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:278
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
-msgstr ""
+msgstr "適用於 iPad 及類似具有解析度 768x1024 的裝置"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:437
 msgid "Intended for generic tablet devices, does no resizing of images"
-msgstr ""
+msgstr "適用於一般平板裝置，不重新設定圖片的大小"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:445
 msgid ""
 "Intended for the Samsung Galaxy and similar tablet devices with a resolution "
 "of 600x1280"
-msgstr ""
+msgstr "適用於 Samsung Galaxy 及類似具有解析度 600x1280 的裝置"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:471
 msgid "This profile is intended for the Kobo Reader."
@@ -698,13 +700,13 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:98
 msgid "Apple device detected, launching iTunes, please wait ..."
-msgstr ""
+msgstr "偵測到 Apple 裝置，執行 iTunes，請稍候 ..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:100
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
-msgstr ""
+msgstr "不能直接從 iDevice 複製書籍。請從 iTunes Library 拖曳到桌面，然後加入 calibre 的書庫視窗。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:260
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:263
@@ -718,7 +720,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3012
 msgid "%d of %d"
-msgstr ""
+msgstr "%d / %d"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:385
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:992
@@ -728,11 +730,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:560
 msgid "Use Series as Category in iTunes/iBooks"
-msgstr ""
+msgstr "以叢書做為 iTunes/iBooks 中的分類"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:562
 msgid "Cache covers from iTunes/iBooks"
-msgstr ""
+msgstr "快取 iTunes/iBooks 封面"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:574
 msgid ""
@@ -740,12 +742,17 @@ msgid ""
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"有些書籍在 iTunes 資料庫中找不到。\n"
+"可能已使用 iBooks 程式刪除了。\n"
+"點選「顯示詳細資料」來查看清單。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:911
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"某些封面圖片無法轉換。\n"
+"點選「顯示詳細資料」來查看清單。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2553
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
@@ -783,18 +790,18 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:41
 msgid "Device IP Address (restart calibre after changing)"
-msgstr ""
+msgstr "裝置 IP 位址 (改變後請重新啟動 calibre)"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:46
 msgid ""
 "Unable to add book to library directly from Bambook. Please save the book to "
 "disk and add the file to library from disk."
-msgstr ""
+msgstr "無法直接從 Bambook 將書籍加入書庫。請將書籍儲存至磁碟後再從磁碟將檔案加入書庫。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:66
 msgid ""
 "Unable to connect to Bambook, you need to install Bambook library first."
-msgstr ""
+msgstr "無法連線到 Bambook，您需要先安裝 Bambook 書庫。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:74
 msgid ""
@@ -802,10 +809,12 @@ msgid ""
 "If you are trying to connect via Wi-Fi, please make sure the IP address of "
 "Bambook has been correctly configured."
 msgstr ""
+"無法連線到 Bambook。\n"
+"如果您嘗試透過 Wi-Fi 連線，請確定 Bambook 的 IP 位址已經正確的設定了。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:111
 msgid "Bambook"
-msgstr ""
+msgstr "Bambook"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:217
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:233
@@ -866,7 +875,7 @@ msgstr "正在傳送元數據到裝置..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
 msgid "Bambook SDK has not been installed."
-msgstr ""
+msgstr "Bambook SDK 尚未安裝。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -905,7 +914,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:233
 msgid "Communicate with the PocketBook 602/603/902/903 reader."
-msgstr ""
+msgstr "與 PocketBook 602/603/902/903 閱讀器連接。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:252
 msgid "Communicate with the PocketBook 701"
@@ -930,7 +939,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:32
 msgid "Use an arbitrary folder as a device."
-msgstr ""
+msgstr "使用任意資料夾做為裝置。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:28
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:14
@@ -987,7 +996,7 @@ msgstr "John Schember"
 
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:44
 msgid "Cannot get files from this device"
-msgstr ""
+msgstr "不能從這個裝置取得檔案"
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
@@ -1033,7 +1042,7 @@ msgstr ""
 msgid ""
 "The Kobo supports only one collection currently: the \"Im_Reading\" list.  "
 "Create a tag called \"Im_Reading\" "
-msgstr ""
+msgstr "Kobo 的支援目前只能有一個收藏：「Im_Reading」清單。請建立一個名為「Im_Reading」的標籤 "
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:279
@@ -1196,7 +1205,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3/K5 reader."
-msgstr ""
+msgstr "與 Teclast K3/K5 閱讀器連接。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:36
 msgid "Communicate with the Newsmy reader."
@@ -10137,7 +10146,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:225
 msgid "Success"
-msgstr ""
+msgstr "成功"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:181
 msgid ""
@@ -10544,7 +10553,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:104
 msgid "C&reate"
-msgstr ""
+msgstr "建立(&R)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:105
 msgid "&Program Code: (be sure to follow python indenting rules)"
@@ -10552,15 +10561,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:36
 msgid "Switch between library and device views"
-msgstr ""
+msgstr "在書庫與裝置檢視之間切換"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:39
 msgid "Separator"
-msgstr ""
+msgstr "分隔線"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:55
 msgid "Choose library"
-msgstr ""
+msgstr "選擇書庫"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:206
 msgid "The main toolbar"
@@ -12588,7 +12597,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:850
 msgid "Name:"
-msgstr ""
+msgstr "名稱："
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:851
 msgid "Search string:"
@@ -12600,7 +12609,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:860
 msgid "added"
-msgstr ""
+msgstr "已加入"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:865
 msgid "Error: You must specify a name"
@@ -12969,7 +12978,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:86
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:107
 msgid "Go to"
-msgstr ""
+msgstr "移至"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:102
 msgid "First"