From 8e7d2a2ee8f276f6277134eb6d2b498fe9dffdd1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Jul 2009 19:51:57 -0600 Subject: [PATCH] IGN:Tag release --- src/calibre/constants.py | 2 +- src/calibre/library/server.py | 3 +- src/calibre/translations/calibre.pot | 102 +++++++++++++++------------ 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 7e38f3c47f..297a38e82d 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.6.0b17' +__version__ = '0.6.0' __author__ = "Kovid Goyal " import re diff --git a/src/calibre/library/server.py b/src/calibre/library/server.py index 0a13800f75..d0ea9e962e 100644 --- a/src/calibre/library/server.py +++ b/src/calibre/library/server.py @@ -8,6 +8,7 @@ HTTP server for remote access to the calibre database. ''' import sys, textwrap, operator, os, re, logging, cStringIO +import __builtin__ from itertools import repeat from logging.handlers import RotatingFileHandler from datetime import datetime @@ -352,7 +353,7 @@ class LibraryServer(object): book, books = MarkupTemplate(self.BOOK), [] for record in items[start:start+num]: - aus = record[2] if record[2] else __builtins__._('Unknown') + aus = record[2] if record[2] else __builtin__._('Unknown') authors = '|'.join([i.replace('|', ',') for i in aus.split(',')]) record[10] = fmt_sidx(float(record[10])) books.append(book.generate(r=record, authors=authors).render('xml').decode('utf-8')) diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index c8b030f776..68e73035c8 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.0b16\n" -"POT-Creation-Date: 2009-07-22 07:39+MDT\n" -"PO-Revision-Date: 2009-07-22 07:39+MDT\n" +"Project-Id-Version: calibre 0.6.0\n" +"POT-Creation-Date: 2009-07-24 19:49+MDT\n" +"PO-Revision-Date: 2009-07-24 19:49+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -33,6 +33,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:52 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:317 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:320 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1895 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1897 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:225 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:256 @@ -63,11 +65,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:736 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:44 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:46 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:857 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:862 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:900 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:136 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:138 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:866 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:871 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:909 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:135 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:84 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:103 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:104 @@ -128,8 +130,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/database2.py:1599 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1621 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1672 -#: /home/kovid/work/calibre/src/calibre/library/server.py:294 -#: /home/kovid/work/calibre/src/calibre/library/server.py:355 +#: /home/kovid/work/calibre/src/calibre/library/server.py:295 +#: /home/kovid/work/calibre/src/calibre/library/server.py:356 #: /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 @@ -204,19 +206,19 @@ msgstr "" msgid "Conversion Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:118 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:122 msgid "Save the output from the input plugin to the specified directory. Useful if you are unsure at which stage of the conversion process a bug is occurring. WARNING: This completely deletes the contents of the specified directory." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:127 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:131 msgid "Specify the character encoding of the input document. If set this option will override any encoding declared by the document itself. Particularly useful for documents that do not declare an encoding or that have erroneous encoding declarations." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:243 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:247 msgid "Conversion Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:257 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:261 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 "" @@ -1009,7 +1011,7 @@ msgstr "" msgid "Cannot read from: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1990 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996 msgid "Failed to process opf file" msgstr "" @@ -1384,8 +1386,8 @@ msgid "" "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1053 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1260 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1269 msgid "Cover" msgstr "" @@ -1414,70 +1416,70 @@ msgstr "" msgid "All articles" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1261 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1270 msgid "Title Page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1262 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1271 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:48 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168 msgid "Table of Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1263 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1272 msgid "Index" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1264 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1273 msgid "Glossary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1265 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1274 msgid "Acknowledgements" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1266 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1275 msgid "Bibliography" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1267 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1276 msgid "Colophon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1268 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1277 msgid "Copyright" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1269 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1278 msgid "Dedication" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1270 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1279 msgid "Epigraph" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1271 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1280 msgid "Foreword" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1272 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1281 msgid "List of Illustrations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1273 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1282 msgid "List of Tables" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1274 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1283 msgid "Notes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1275 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1284 msgid "Preface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1276 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1285 msgid "Main Text" msgstr "" @@ -1537,11 +1539,11 @@ msgstr "" msgid "Generate an Adobe \"page-map\" file if pagination information is available." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:112 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:114 msgid "Footnotes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:121 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:123 msgid "Sidebar" msgstr "" @@ -3584,8 +3586,7 @@ msgid "Meta information" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:341 -msgid "Author S&ort: " +msgid "Author s&ort: " msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142 @@ -3611,7 +3612,7 @@ msgid " stars" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148 -msgid "Add Ta&gs: " +msgid "Add ta&gs: " msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150 @@ -3718,6 +3719,10 @@ msgstr "" msgid "Swap the author and title" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:341 +msgid "Author S&ort: " +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:343 msgid "Automatically create the author sort entry based on the current author entry" msgstr "" @@ -5953,11 +5958,11 @@ msgstr "" msgid "Compacting database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server.py:146 +#: /home/kovid/work/calibre/src/calibre/library/server.py:147 msgid "Password to access your calibre library. Username is " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server.py:429 +#: /home/kovid/work/calibre/src/calibre/library/server.py:430 msgid "" "[options]\n" "\n" @@ -6226,12 +6231,14 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_accountancyage.py:25 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_al_jazeera.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_atlantic.py:17 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_azstarnet.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_barrons.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_bbc.py:16 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_bbc.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_business_week.py:16 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py:22 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py:17 @@ -6239,6 +6246,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py:10 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_climate_progress.py:23 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cnn.py:15 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_coding_horror.py:17 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_common_dreams.py:8 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py:23 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_craigslist.py:15 @@ -6276,8 +6284,10 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_krstarica_en.py:23 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_latimes.py:17 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linux_magazine.py:16 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linuxdevices.py:19 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lrb.py:17 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moneynews.py:16 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py:23 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34 @@ -6303,14 +6313,17 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_news.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sciencedaily.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_scientific_american.py:16 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py:18 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_seattle_times.py:22 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_security_watch.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_shacknews.py:10 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_slashdot.py:15 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_slate.py:18 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_smh.py:19 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_soldiers.py:26 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegel_int.py:17 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py:23 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_stackoverflow.py:18 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_starbulletin.py:19 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_straitstimes.py:22 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py:18 @@ -6336,7 +6349,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wash_post.py:12 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wikinews_en.py:23 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_winsupersite.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wired.py:15 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wired.py:14 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wsj.py:16 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:16 @@ -6399,6 +6412,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_publico.py:20 msgid "Portugese" msgstr "" @@ -6420,10 +6434,6 @@ msgstr "" msgid "Skipping filtered article: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_publico.py:20 -msgid "Portuguese" -msgstr "" - #: #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_usatoday.py:18 msgid "Kovid Goyal and Sujata Raman"